clang-format : Set PenaltyBreakAssignment to 130

ApplicationCode/.clang-format

@@ -52,7 +52,7 @@ MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: Inner
-PenaltyBreakAssignment: 200
+PenaltyBreakAssignment: 130
 PenaltyBreakBeforeFirstCallParameter: 100000
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120

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;
 

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()
+                        existingObjectsWithCustomFonts =
-                                                             ->hasTextAnnotationsWithCustomFontSize( oldFontSize );
+                            gridView->annotationCollection()->hasTextAnnotationsWithCustomFontSize( oldFontSize );
                     }
                     RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>( rim3dView );
                     if ( eclipseView )

ApplicationCode/Application/RiaMemoryCleanup.cpp

@@ -280,7 +280,8 @@ QList<caf::PdmOptionItemInfo> RiaMemoryCleanup::calculateValueOptions( const caf
                     const RigFemResultAddress& result = m_geomResultAddresses[i];
                     bool                       inUse  = resultsInUse.count( result );
                     QString posText = caf::AppEnum<RigFemResultPosEnum>::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 ) );

ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp

@@ -152,11 +152,8 @@ void RiaRegressionTestRunner::runRegressionTest()
         }
     }
 
-    QString htmlReportFileName = generateHtmlReport( folderList,
+    QString htmlReportFileName =
-                                                     baseFolderName,
+        generateHtmlReport( folderList, baseFolderName, generatedFolderName, diffFolderName, testDir );
-                                                     generatedFolderName,
-                                                     diffFolderName,
-                                                     testDir );
 
     if ( regressionTestConfig.openReportInBrowser() )
     {

ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.cpp

@@ -145,8 +145,8 @@ void RicfFieldReader<bool>::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 )
+        QString errorMessage =
-                                   .arg( errorMessageContainer->currentCommand );
+            formatString.arg( errorMessageContainer->currentArgument ).arg( errorMessageContainer->currentCommand );
         errorMessageContainer->addError( errorMessage );
     }
     fieldValue = evaluatesToTrue;

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." )
+            QString warning =
-                                  .arg( caseId );
+                QString( "computeCaseGroupStatistics: Could not find statistics case with ID %1." ).arg( caseId );
 
             RiaLogging::warning( warning );
             response.updateStatus( RicfCommandResponse::COMMAND_WARNING, warning );

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();

ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp

@@ -176,8 +176,8 @@ RicfCommandResponse RicfExportWellPathCompletions::execute()
             }
             else
             {
-                QString warning = QString( "exportWellPathCompletions: Could not find well path with name %1" )
+                QString warning =
-                                      .arg( wellPathName );
+                    QString( "exportWellPathCompletions: Could not find well path with name %1" ).arg( wellPathName );
                 RiaLogging::warning( warning );
                 response.updateStatus( RicfCommandResponse::COMMAND_WARNING, warning );
             }

ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp

@@ -76,8 +76,8 @@ void RicExportFishbonesLateralsFeature::onActionTriggered( bool isChecked )
             {
                 for ( size_t lateralIndex : sub.lateralIndices )
                 {
-                    std::vector<std::pair<cvf::Vec3d, double>> coordsAndMD = fishbone->coordsAndMDForLateral( sub.subIndex,
+                    std::vector<std::pair<cvf::Vec3d, double>> coordsAndMD =
-                                                                                                              lateralIndex );
+                        fishbone->coordsAndMDForLateral( sub.subIndex, lateralIndex );
 
                     std::vector<cvf::Vec3d> lateralCoords;
                     std::vector<double>     lateralMDs;

ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp

@@ -115,8 +115,8 @@ RimFishbonesCollection* RicNewFishbonesSubsFeature::selectedFishbonesCollection(
         {
             return wellPaths[0]->fishbonesCollection();
         }
-        RimWellPathCompletions* completions = caf::SelectionManager::instance()
+        RimWellPathCompletions* completions =
-                                                  ->selectedItemOfType<RimWellPathCompletions>();
+            caf::SelectionManager::instance()->selectedItemOfType<RimWellPathCompletions>();
         if ( completions )
         {
             return completions->fishbonesCollection();

ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalFeature.cpp

@@ -99,8 +99,8 @@ RimPerforationCollection* RicNewPerforationIntervalFeature::selectedPerforationC
         RimWellPath* wellPath = dynamic_cast<RimWellPath*>( objHandle );
         if ( wellPath ) return wellPath->perforationIntervalCollection();
 
-        RimWellPathCompletions* completions = caf::SelectionManager::instance()
+        RimWellPathCompletions* completions =
-                                                  ->selectedItemOfType<RimWellPathCompletions>();
+            caf::SelectionManager::instance()->selectedItemOfType<RimWellPathCompletions>();
         if ( completions ) return completions->perforationCollection();
     }
     return nullptr;

ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp

@@ -257,7 +257,8 @@ QList<caf::PdmOptionItemInfo>
                         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 )

ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsWellSegmentsFeature.cpp

@@ -63,12 +63,12 @@ void RicExportCompletionsWellSegmentsFeature::onActionTriggered( bool isChecked
     RimWellPath* wellPath = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellPath>();
     CVF_ASSERT( wellPath );
 
-    RimFishbonesCollection* fishbonesCollection = caf::SelectionManager::instance()
+    RimFishbonesCollection* fishbonesCollection =
-                                                      ->selectedItemAncestorOfType<RimFishbonesCollection>();
+        caf::SelectionManager::instance()->selectedItemAncestorOfType<RimFishbonesCollection>();
-    RimWellPathFractureCollection* fractureCollection = caf::SelectionManager::instance()
+    RimWellPathFractureCollection* fractureCollection =
-                                                            ->selectedItemAncestorOfType<RimWellPathFractureCollection>();
+        caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellPathFractureCollection>();
-    RimPerforationCollection* perforationCollection = caf::SelectionManager::instance()
+    RimPerforationCollection* perforationCollection =
-                                                          ->selectedItemAncestorOfType<RimPerforationCollection>();
+        caf::SelectionManager::instance()->selectedItemAncestorOfType<RimPerforationCollection>();
 
     CVF_ASSERT( fishbonesCollection || fractureCollection || perforationCollection );
 

ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp

@@ -368,11 +368,8 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
             }
         }
 
-        std::vector<RigCompletionData> allCompletionsForOneFracture = generateCompdatValuesForFracture( matrixToWellTrans,
+        std::vector<RigCompletionData> allCompletionsForOneFracture =
-                                                                                                        wellNameForExport,
+            generateCompdatValuesForFracture( matrixToWellTrans, wellNameForExport, caseToApply, fracture, fracTemplate );
-                                                                                                        caseToApply,
-                                                                                                        fracture,
-                                                                                                        fracTemplate );
 
         if ( fractureDataReportItems )
         {

ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp

@@ -216,9 +216,9 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneLateralsWell
                 for ( std::shared_ptr<RicMswSubSegmentCellIntersection> intersection : segment->intersections() )
                 {
                     double  diameter = location->holeDiameter();
-                    QString completionMetaData = ( location->label() + QString( ": Sub: %1 Lateral: %2" )
+                    QString completionMetaData =
-                                                                           .arg( location->subIndex() )
+                        ( location->label() +
-                                                                           .arg( completion->index() ) );
+                          QString( ": Sub: %1 Lateral: %2" ).arg( location->subIndex() ).arg( completion->index() ) );
 
                     WellBorePartForTransCalc wellBorePart = WellBorePartForTransCalc( intersection->lengthsInCell(),
                                                                                       diameter / 2.0,

ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.cpp

@@ -212,8 +212,8 @@ std::vector<RimWellPath*> RicWellPathExportCompletionDataFeature::selectedWellPa
 
     if ( wellPaths.empty() )
     {
-        RimWellPathCompletions* completions = caf::SelectionManager::instance()
+        RimWellPathCompletions* completions =
-                                                  ->selectedItemAncestorOfType<RimWellPathCompletions>();
+            caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellPathCompletions>();
         if ( completions )
         {
             RimWellPath* wellPath = nullptr;

ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp

@@ -476,9 +476,9 @@ std::vector<RigCompletionData>
         exportSettings.includePerforations = true;
         exportSettings.includeFractures    = true;
 
-        completionsPerEclipseCell = generatePerforationsCompdatValues( wellPath,
+        completionsPerEclipseCell =
-                                                                       wellPath->perforationIntervalCollection()
+            generatePerforationsCompdatValues( wellPath,
-                                                                           ->perforations(),
+                                               wellPath->perforationIntervalCollection()->perforations(),
                                                exportSettings );
     }
 
@@ -1201,8 +1201,8 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeatureImpl::gener
                                                                       cell.globCellIndex,
                                                                       cell.intersectionLengthsInCellCS );
 
-                const RimNonDarcyPerforationParameters* nonDarcyParameters = wellPath->perforationIntervalCollection()
+                const RimNonDarcyPerforationParameters* nonDarcyParameters =
-                                                                                 ->nonDarcyParameters();
+                    wellPath->perforationIntervalCollection()->nonDarcyParameters();
 
                 double transmissibility = 0.0;
                 double kh               = RigCompletionData::defaultValue();
@@ -1438,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() );

ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp

@@ -89,8 +89,8 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForAllCompletions(
     std::shared_ptr<QFile> unifiedExportFile;
     if ( exportSettings.fileSplit() == RicExportCompletionDataSettingsUi::UNIFIED_FILE )
     {
-        QString unifiedFileName = QString( "UnifiedCompletions_MSW_%1" )
+        QString unifiedFileName =
-                                      .arg( exportSettings.caseToApply->caseUserDescription() );
+            QString( "UnifiedCompletions_MSW_%1" ).arg( exportSettings.caseToApply->caseUserDescription() );
         unifiedExportFile = RicWellPathExportCompletionsFileTools::openFileForExport( exportSettings.folder,
                                                                                       unifiedFileName );
     }

ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp

@@ -88,8 +88,8 @@ void RicAdvancedSnapshotExportFeature::onActionTriggered( bool isChecked )
         {
             QString fallbackFolderName = RiaApplication::instance()->createAbsolutePathFromProjectRelativePath(
                 "snapshots" );
-            QString folderName = RiaApplication::instance()
+            QString folderName =
-                                     ->lastUsedDialogDirectoryWithFallback( "ADVANCED_SNAPSHOT_EXPORT",
+                RiaApplication::instance()->lastUsedDialogDirectoryWithFallback( "ADVANCED_SNAPSHOT_EXPORT",
                                                                                  fallbackFolderName );
             dlg.setExportFolder( folderName );
         }

ApplicationCode/Commands/ExportCommands/RicEclipseCellResultToFileImpl.cpp

@@ -79,10 +79,8 @@ bool RicEclipseCellResultToFileImpl::writeBinaryResultToTextFile( const QString&
 {
     CVF_TIGHT_ASSERT( eclipseCase );
 
-    cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultDefinition( eclipseCase,
+    cvf::ref<RigResultAccessor> resultAccessor =
-                                                                                                       0,
+        RigResultAccessorFactory::createFromResultDefinition( eclipseCase, 0, timeStep, resultDefinition );
-                                                                                                       timeStep,
-                                                                                                       resultDefinition );
     if ( resultAccessor.isNull() )
     {
         return false;

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();

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<RimFlowCharacteristicsPlot*>(
@@ -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<RimFlowCharacteristicsPlot*>(

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<RimWellAllocationPlot*>(
@@ -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<RimWellAllocationPlot*>(

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,
+    RimEclipseView* modifiedView =
+        RicShowContributingWellsFeatureImpl::manipulateSelectedView( eclipseResultCase,
                                                                      well->name(),
-                                                                                                eclipseView
+                                                                     eclipseView->currentTimeStep() );
-                                                                                                    ->currentTimeStep() );
     if ( modifiedView )
     {
         modifiedView->createDisplayModelAndRedraw();

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 );

ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp

@@ -170,8 +170,8 @@ RimWellPathFractureCollection* RicNewWellPathFractureFeature::selectedWellPathFr
         {
             return wellPaths[0]->fractureCollection();
         }
-        RimWellPathCompletions* completions = caf::SelectionManager::instance()
+        RimWellPathCompletions* completions =
-                                                  ->selectedItemOfType<RimWellPathCompletions>();
+            caf::SelectionManager::instance()->selectedItemOfType<RimWellPathCompletions>();
         if ( completions )
         {
             return completions->fractureCollection();

ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotFeature.cpp

@@ -51,8 +51,8 @@ bool RicCreateGridCrossPlotFeature::isCommandEnabled()
 void RicCreateGridCrossPlotFeature::onActionTriggered( bool isChecked )
 {
     RimProject*                 project = RiaApplication::instance()->project();
-    RimGridCrossPlotCollection* collection = caf::SelectionManager::instance()
+    RimGridCrossPlotCollection* collection =
-                                                 ->selectedItemAncestorOfType<RimGridCrossPlotCollection>();
+        caf::SelectionManager::instance()->selectedItemAncestorOfType<RimGridCrossPlotCollection>();
     if ( !collection )
     {
         collection = project->mainPlotCollection()->gridCrossPlotCollection();

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,

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<VdeArrayDataPacket> dataPacket = VdeArrayDataPacket::fromUint32Arr( arrayIdsThisMesh.connArrId,
+                std::unique_ptr<VdeArrayDataPacket> dataPacket =
-                                                                                                    uintArr,
+                    VdeArrayDataPacket::fromUint32Arr( arrayIdsThisMesh.connArrId, uintArr, arrElementCount );
-                                                                                                    arrElementCount );
 
                 // Debug testing of decoding
                 // debugComparePackets(*dataPacket, VdeArrayDataPacket::fromRawPacketBuffer(dataPacket->fullPacketRawPtr(),
@@ -133,8 +132,8 @@ void VdeVizDataExtractor::extractViewContents( QString*            modelMetaJson
             {
                 const float* floatArr        = reinterpret_cast<const float*>( mesh->texCoordArr->ptr() );
                 const size_t arrElementCount = 2 * mesh->texCoordArr->size();
-                arrayIdsThisMesh.texCoordsArrId = m_cachingIdFactory
+                arrayIdsThisMesh.texCoordsArrId =
-                                                      ->getOrCreateIdForFloatArr( VdeCachingHashedIdFactory::TexCoordsArr,
+                    m_cachingIdFactory->getOrCreateIdForFloatArr( VdeCachingHashedIdFactory::TexCoordsArr,
                                                                   floatArr,
                                                                   arrElementCount );
 
@@ -153,8 +152,8 @@ void VdeVizDataExtractor::extractViewContents( QString*            modelMetaJson
             }
             {
                 cvf::ref<cvf::UByteArray> byteArr = mesh->texImage->toRgb();
-                arrayIdsThisMesh.texImageArrId    = m_cachingIdFactory
+                arrayIdsThisMesh.texImageArrId =
-                                                     ->getOrCreateIdForUint8Arr( VdeCachingHashedIdFactory::TexImage,
+                    m_cachingIdFactory->getOrCreateIdForUint8Arr( VdeCachingHashedIdFactory::TexImage,
                                                                   byteArr->ptr(),
                                                                   byteArr->size() );
 

ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp

@@ -72,8 +72,8 @@ void RicCopyReferencesToClipboardFeature::onActionTriggered( bool isChecked )
     {
         if ( RicCopyReferencesToClipboardFeature::isCopyOfObjectSupported( pdmObject ) )
         {
-            QString itemRef = caf::PdmReferenceHelper::referenceFromRootToObject( caf::SelectionManager::instance()
+            QString itemRef =
-                                                                                      ->pdmRootObject(),
+                caf::PdmReferenceHelper::referenceFromRootToObject( caf::SelectionManager::instance()->pdmRootObject(),
                                                                     pdmObject );
 
             referenceList.push_back( itemRef );

ApplicationCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp

@@ -59,8 +59,8 @@ void RicCutReferencesToClipboardFeature::onActionTriggered( bool isChecked )
     {
         if ( RicCutReferencesToClipboardFeature::isCuttingOfObjectSupported( pdmObject ) )
         {
-            QString itemRef = caf::PdmReferenceHelper::referenceFromRootToObject( caf::SelectionManager::instance()
+            QString itemRef =
-                                                                                      ->pdmRootObject(),
+                caf::PdmReferenceHelper::referenceFromRootToObject( caf::SelectionManager::instance()->pdmRootObject(),
                                                                     pdmObject );
 
             referenceList.push_back( itemRef );

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();

ApplicationCode/Commands/RicNewContourMapViewFeature.cpp

@@ -54,10 +54,10 @@ bool RicNewContourMapViewFeature::isCommandEnabled()
 {
     bool selectedView = caf::SelectionManager::instance()->selectedItemOfType<RimGridView>() != nullptr;
     bool selectedCase = caf::SelectionManager::instance()->selectedItemOfType<RimCase>() != nullptr;
-    bool selectedEclipseContourMapCollection = caf::SelectionManager::instance()
+    bool selectedEclipseContourMapCollection =
-                                                   ->selectedItemOfType<RimEclipseContourMapViewCollection>();
+        caf::SelectionManager::instance()->selectedItemOfType<RimEclipseContourMapViewCollection>();
-    bool selectedGeoMechContourMapCollection = caf::SelectionManager::instance()
+    bool selectedGeoMechContourMapCollection =
-                                                   ->selectedItemOfType<RimGeoMechContourMapViewCollection>();
+        caf::SelectionManager::instance()->selectedItemOfType<RimGeoMechContourMapViewCollection>();
     return selectedView || selectedCase || selectedEclipseContourMapCollection || selectedGeoMechContourMapCollection;
 }
 
@@ -67,14 +67,14 @@ bool RicNewContourMapViewFeature::isCommandEnabled()
 void RicNewContourMapViewFeature::onActionTriggered( bool isChecked )
 {
     RimEclipseView*           reservoirView = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseView>();
-    RimEclipseContourMapView* existingEclipseContourMap = caf::SelectionManager::instance()
+    RimEclipseContourMapView* existingEclipseContourMap =
-                                                              ->selectedItemOfType<RimEclipseContourMapView>();
+        caf::SelectionManager::instance()->selectedItemOfType<RimEclipseContourMapView>();
     RimEclipseCase* eclipseCase = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimEclipseCase>();
     RimEclipseContourMapView* eclipseContourMap = nullptr;
 
     RimGeoMechView*           geoMechView = caf::SelectionManager::instance()->selectedItemOfType<RimGeoMechView>();
-    RimGeoMechContourMapView* existingGeoMechContourMap = caf::SelectionManager::instance()
+    RimGeoMechContourMapView* existingGeoMechContourMap =
-                                                              ->selectedItemOfType<RimGeoMechContourMapView>();
+        caf::SelectionManager::instance()->selectedItemOfType<RimGeoMechContourMapView>();
     RimGeoMechCase* geoMechCase = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimGeoMechCase>();
     RimGeoMechContourMapView* geoMechContourMap = nullptr;
 

ApplicationCode/Commands/RicNewGridPlotWindowFeature.cpp

@@ -82,8 +82,8 @@ RicfCommandResponse RicNewGridPlotWindowFeature::execute()
 //--------------------------------------------------------------------------------------------------
 bool RicNewGridPlotWindowFeature::isCommandEnabled()
 {
-    RimGridPlotWindowCollection* gridPlotCollection = caf::SelectionManager::instance()
+    RimGridPlotWindowCollection* gridPlotCollection =
-                                                          ->selectedItemOfType<RimGridPlotWindowCollection>();
+        caf::SelectionManager::instance()->selectedItemOfType<RimGridPlotWindowCollection>();
     if ( gridPlotCollection )
     {
         return true;

ApplicationCode/Commands/RicSelectOrCreateViewFeatureImpl.cpp

@@ -73,8 +73,8 @@ RimEclipseView* RicSelectOrCreateViewFeatureImpl::showViewSelection( RimEclipseR
         viewToManipulate = featureUi.selectedView();
     }
 
-    QString refFromProjectToView = caf::PdmReferenceHelper::referenceFromRootToObject( RiaApplication::instance()->project(),
+    QString refFromProjectToView =
-                                                                                       viewToManipulate );
+        caf::PdmReferenceHelper::referenceFromRootToObject( RiaApplication::instance()->project(), viewToManipulate );
     RiaApplication::instance()->setCacheDataObject( lastUsedViewKey, refFromProjectToView );
 
     return viewToManipulate;

ApplicationCode/Commands/SummaryPlotCommands/RicPasteTimeHistoryCurveFeature.cpp

@@ -72,7 +72,8 @@ void RicPasteTimeHistoryCurveFeature::onActionTriggered( bool isChecked )
         return;
     }
 
-    std::vector<caf::PdmPointer<RimGridTimeHistoryCurve>> sourceObjects = RicPasteTimeHistoryCurveFeature::timeHistoryCurves();
+    std::vector<caf::PdmPointer<RimGridTimeHistoryCurve>> sourceObjects =
+        RicPasteTimeHistoryCurveFeature::timeHistoryCurves();
 
     for ( size_t i = 0; i < sourceObjects.size(); i++ )
     {

ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp

@@ -155,8 +155,8 @@ void RicSummaryCurveCalculator::defineUiOrdering( QString uiConfigName, caf::Pdm
     }
 
     {
-        caf::PdmUiGroup* group = uiOrdering
+        caf::PdmUiGroup* group =
-                                     .addNewGroupWithKeyword( "Calculated Summaries",
+            uiOrdering.addNewGroupWithKeyword( "Calculated Summaries",
                                                RicSummaryCurveCalculator::calculatedSummariesGroupName() );
         group->add( &m_currentCalculation );
         group->add( &m_newCalculation );

ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp

@@ -500,8 +500,8 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin
                     {
                         for ( RimSummaryCase* sumCase : summaryCasesToUse )
                         {
-                            const std::set<RifEclipseSummaryAddress>& allAddrsInCase = sumCase->summaryReader()
+                            const std::set<RifEclipseSummaryAddress>& allAddrsInCase =
-                                                                                           ->allResultAddresses();
+                                sumCase->summaryReader()->allResultAddresses();
                             if ( allAddrsInCase.count( addr ) )
                             {
                                 RimSummaryCurve* newCurve = new RimSummaryCurve();

ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp

@@ -132,8 +132,8 @@ bool RicNewWellBoreStabilityPlotFeature::isCommandEnabled()
 void RicNewWellBoreStabilityPlotFeature::onActionTriggered( bool isChecked )
 {
     RimWellPath*              wellPath = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellPath>();
-    RimWellLogPlotCollection* plotCollection = caf::SelectionManager::instance()
+    RimWellLogPlotCollection* plotCollection =
-                                                   ->selectedItemOfType<RimWellLogPlotCollection>();
+        caf::SelectionManager::instance()->selectedItemOfType<RimWellLogPlotCollection>();
     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,
+        RimWellLogWbsCurve* curve =
-                                                                         geoMechCase,
+            RicWellLogTools::addWellLogWbsCurve( stabilityCurvesTrack, geoMechCase, nullptr, wellPath, -1, false, false );
-                                                                         nullptr,
-                                                                         wellPath,
-                                                                         -1,
-                                                                         false,
-                                                                         false );
         curve->setGeoMechResultAddress( resAddr );
         curve->setCurrentTimeStep( timeStep );
         curve->setAutoNameComponents( false, true, false, false, false );

ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp

@@ -108,9 +108,9 @@ bool RicCreateWellTargetsPickEventHandler::handle3dPickEvent( const Ric3dPickEve
                                                                                 intersectionPointInDomain );
 
             double md = wellPathSourceInfo->measuredDepth( firstPickItem.faceIdx(), intersectionPointInDomain );
-            doSetAzimuthAndInclination = calculateAzimuthAndInclinationAtMd( md,
+            doSetAzimuthAndInclination =
-                                                                             wellPathSourceInfo->wellPath()
+                calculateAzimuthAndInclinationAtMd( md,
-                                                                                 ->wellPathGeometry(),
+                                                    wellPathSourceInfo->wellPath()->wellPathGeometry(),
                                                     &azimuth,
                                                     &inclination );
         }

ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp

@@ -71,8 +71,8 @@ void RicDeleteWellPathAttributeFeature::onActionTriggered( bool isChecked )
     }
     else
     {
-        wellPathAttributeCollection = caf::SelectionManager::instance()
+        wellPathAttributeCollection =
-                                          ->selectedItemOfType<RimWellPathAttributeCollection>();
+            caf::SelectionManager::instance()->selectedItemOfType<RimWellPathAttributeCollection>();
         if ( wellPathAttributeCollection )
         {
             wellPathAttributeCollection->deleteAllAttributes();

ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp

@@ -789,14 +789,12 @@ std::map<QString, QString> RifEclipseInputFileTools::readProperties( const QStri
 
         fseek( gridFilePointer, fileKeywords[i].filePos, SEEK_SET );
 
-        ecl_kw_type* eclipseKeywordData = ecl_kw_fscanf_alloc_current_grdecl__( gridFilePointer,
+        ecl_kw_type* eclipseKeywordData =
-                                                                                false,
+            ecl_kw_fscanf_alloc_current_grdecl__( gridFilePointer, false, ecl_type_create_from_type( ECL_FLOAT_TYPE ) );
-                                                                                ecl_type_create_from_type(
-                                                                                    ECL_FLOAT_TYPE ) );
         if ( eclipseKeywordData )
         {
-            QString newResultName = caseData->results( RiaDefines::MATRIX_MODEL )
+            QString newResultName =
-                                        ->makeResultNameUnique( fileKeywords[i].keyword );
+                caseData->results( RiaDefines::MATRIX_MODEL )->makeResultNameUnique( fileKeywords[i].keyword );
             QString errMsg;
             if ( readDataFromKeyword( eclipseKeywordData, caseData, newResultName, &errMsg ) )
             {

ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp

@@ -410,7 +410,8 @@ 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,
+        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.
 

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,
+                        bool success =
-                                                             RiaStringEncodingTools::toNativeEncoded( indexFileName )
+                            ecl_file_write_index( m_ecl_file,
-                                                                 .data() );
+                                                  RiaStringEncodingTools::toNativeEncoded( indexFileName ).data() );
 
                         if ( success )
                         {

ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp

@@ -954,12 +954,11 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid )
         m_dynamicResultsAccess->resultNames( &resultNames, &resultNamesDataItemCounts );
 
         {
-            QStringList matrixResultNames = validKeywordsForPorosityModel( resultNames,
+            QStringList matrixResultNames =
+                validKeywordsForPorosityModel( resultNames,
                                                resultNamesDataItemCounts,
-                                                                           m_eclipseCase->activeCellInfo(
+                                               m_eclipseCase->activeCellInfo( RiaDefines::MATRIX_MODEL ),
-                                                                               RiaDefines::MATRIX_MODEL ),
+                                               m_eclipseCase->activeCellInfo( RiaDefines::FRACTURE_MODEL ),
-                                                                           m_eclipseCase->activeCellInfo(
-                                                                               RiaDefines::FRACTURE_MODEL ),
                                                RiaDefines::MATRIX_MODEL,
                                                m_dynamicResultsAccess->timeStepCount() );
 
@@ -972,12 +971,11 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid )
         }
 
         {
-            QStringList fractureResultNames = validKeywordsForPorosityModel( resultNames,
+            QStringList fractureResultNames =
+                validKeywordsForPorosityModel( resultNames,
                                                resultNamesDataItemCounts,
-                                                                             m_eclipseCase->activeCellInfo(
+                                               m_eclipseCase->activeCellInfo( RiaDefines::MATRIX_MODEL ),
-                                                                                 RiaDefines::MATRIX_MODEL ),
+                                               m_eclipseCase->activeCellInfo( RiaDefines::FRACTURE_MODEL ),
-                                                                             m_eclipseCase->activeCellInfo(
-                                                                                 RiaDefines::FRACTURE_MODEL ),
                                                RiaDefines::FRACTURE_MODEL,
                                                m_dynamicResultsAccess->timeStepCount() );
 
@@ -1047,12 +1045,11 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid )
         }
 
         {
-            QStringList matrixResultNames = validKeywordsForPorosityModel( resultNames,
+            QStringList matrixResultNames =
+                validKeywordsForPorosityModel( resultNames,
                                                resultNamesDataItemCounts,
-                                                                           m_eclipseCase->activeCellInfo(
+                                               m_eclipseCase->activeCellInfo( RiaDefines::MATRIX_MODEL ),
-                                                                               RiaDefines::MATRIX_MODEL ),
+                                               m_eclipseCase->activeCellInfo( RiaDefines::FRACTURE_MODEL ),
-                                                                           m_eclipseCase->activeCellInfo(
-                                                                               RiaDefines::FRACTURE_MODEL ),
                                                RiaDefines::MATRIX_MODEL,
                                                1 );
 
@@ -1068,12 +1065,11 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid )
         }
 
         {
-            QStringList fractureResultNames = validKeywordsForPorosityModel( resultNames,
+            QStringList fractureResultNames =
+                validKeywordsForPorosityModel( resultNames,
                                                resultNamesDataItemCounts,
-                                                                             m_eclipseCase->activeCellInfo(
+                                               m_eclipseCase->activeCellInfo( RiaDefines::MATRIX_MODEL ),
-                                                                                 RiaDefines::MATRIX_MODEL ),
+                                               m_eclipseCase->activeCellInfo( RiaDefines::FRACTURE_MODEL ),
-                                                                             m_eclipseCase->activeCellInfo(
-                                                                                 RiaDefines::FRACTURE_MODEL ),
                                                RiaDefines::FRACTURE_MODEL,
                                                1 );
             // Add 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<int, std::vector<SegmentPositionContribution>>::iterator posContribIt = segmentIdToPositionContrib
+                std::map<int, std::vector<SegmentPositionContribution>>::iterator posContribIt =
-                                                                                                     .begin();
+                    segmentIdToPositionContrib.begin();
                 std::map<int, cvf::Vec3d> bottomPositions;
                 while ( posContribIt != segmentIdToPositionContrib.end() )
                 {
@@ -2088,7 +2084,8 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo
                                                                                    static_cast<int>( 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],
+                                RigWellResultPoint wellRp =
-                                                                                   ert_connection,
+                                    createWellResultPoint( grids[gridNr], ert_connection, -1, -1, wellName );
-                                                                                   -1,
-                                                                                   -1,
-                                                                                   wellName );
 
                                 if ( !subCellConnCalc.hasSubCellConnection( wellRp ) )
                                 {

ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp

@@ -724,22 +724,16 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateMeanStressSEM( i
         "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) );
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* sa11 = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* sa11 =
-                                                                   RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S11" ) );
-                                                                                        "SE",
-                                                                                        "S11" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* sa22 = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* sa22 =
-                                                                   RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S22" ) );
-                                                                                        "SE",
-                                                                                        "S22" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* sa33 = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* sa33 =
-                                                                   RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S33" ) );
-                                                                                        "SE",
-                                                                                        "S33" ) );
 
     RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
 
@@ -779,16 +773,12 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateSFI( int partInd
         "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) );
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* se1Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* se1Frames =
-                                                                        RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S1" ) );
-                                                                                             "SE",
-                                                                                             "S1" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* se3Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* se3Frames =
-                                                                        RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S3" ) );
-                                                                                             "SE",
-                                                                                             "S3" ) );
 
     RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
 
@@ -843,16 +833,12 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDSM( int partInd
         "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) );
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* se1Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* se1Frames =
-                                                                        RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S1" ) );
-                                                                                             "SE",
-                                                                                             "S1" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* se3Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* se3Frames =
-                                                                        RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S3" ) );
-                                                                                             "SE",
-                                                                                             "S3" ) );
 
     RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
 
@@ -894,10 +880,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateFOS( int partInd
         "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) );
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* dsmFrames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* dsmFrames =
-                                                                        RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "DSM" ) );
-                                                                                             "SE",
-                                                                                             "DSM" ) );
 
     RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
 
@@ -938,22 +922,16 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateMeanStressSTM( i
         "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) );
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* st11 = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* st11 =
-                                                                   RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S11" ) );
-                                                                                        "ST",
-                                                                                        "S11" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* st22 = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* st22 =
-                                                                   RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S22" ) );
-                                                                                        "ST",
-                                                                                        "S22" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* st33 = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* st33 =
-                                                                   RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S33" ) );
-                                                                                        "ST",
-                                                                                        "S33" ) );
 
     RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
 
@@ -995,29 +973,21 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDeviatoricStress
         "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) );
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* st11 = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* st11 =
-                                                                   RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S1" ) );
-                                                                                        "ST",
-                                                                                        "S1" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* st22 = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* st22 =
-                                                                   RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S2" ) );
-                                                                                        "ST",
-                                                                                        "S2" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* st33 = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* st33 =
-                                                                   RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S3" ) );
-                                                                                        "ST",
-                                                                                        "S3" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* stm = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* stm =
-                                                                  RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "STM" ) );
-                                                                                       "ST",
-                                                                                       "STM" ) );
 
     RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
 
@@ -1172,40 +1142,28 @@ RigFemScalarResultFrames*
         "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) );
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* s11Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* s11Frames =
-                                                                        RigFemResultAddress( RIG_ELEMENT_NODAL,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S11" ) );
-                                                                                             resVarAddr.fieldName,
-                                                                                             "S11" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* s22Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* s22Frames =
-                                                                        RigFemResultAddress( RIG_ELEMENT_NODAL,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S22" ) );
-                                                                                             resVarAddr.fieldName,
-                                                                                             "S22" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* s33Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* s33Frames =
-                                                                        RigFemResultAddress( RIG_ELEMENT_NODAL,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S33" ) );
-                                                                                             resVarAddr.fieldName,
-                                                                                             "S33" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* s12Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* s12Frames =
-                                                                        RigFemResultAddress( RIG_ELEMENT_NODAL,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S12" ) );
-                                                                                             resVarAddr.fieldName,
-                                                                                             "S12" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* s23Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* s23Frames =
-                                                                        RigFemResultAddress( RIG_ELEMENT_NODAL,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S23" ) );
-                                                                                             resVarAddr.fieldName,
-                                                                                             "S23" ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* s13Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* s13Frames =
-                                                                        RigFemResultAddress( RIG_ELEMENT_NODAL,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S13" ) );
-                                                                                             resVarAddr.fieldName,
-                                                                                             "S13" ) );
 
     RigFemScalarResultFrames* SNFrames = m_femPartResults[partIndex]->createScalarResult(
         RigFemResultAddress( resVarAddr.resultPosType, resVarAddr.fieldName, "SN" ) );
@@ -1709,10 +1667,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateCompactionValues
     caf::ProgressInfo frameCountProgress( this->frameCount() + 1, "" );
     frameCountProgress.setProgressDescription( "Calculating " + QString::fromStdString( resVarAddr.fieldName ) );
 
-    RigFemScalarResultFrames* u3Frames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* u3Frames =
-                                                                       RigFemResultAddress( resVarAddr.resultPosType,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "U", "U3" ) );
-                                                                                            "U",
-                                                                                            "U3" ) );
     frameCountProgress.incrementProgress();
 
     RigFemScalarResultFrames* compactionFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
@@ -1830,10 +1786,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateSE( int partInde
                                       RigFemResultAddress( resVarAddr.resultPosType, "S-Bar", resVarAddr.componentName ) );
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
-    RigFemScalarResultFrames* srcPORDataFrames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* srcPORDataFrames =
-                                                                               RigFemResultAddress( RIG_NODAL,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_NODAL, "POR-Bar", "" ) );
-                                                                                                    "POR-Bar",
-                                                                                                    "" ) );
     RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
 
     frameCountProgress.incrementProgress();
@@ -1907,10 +1861,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateST_11_22_33( int
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* srcPORDataFrames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* srcPORDataFrames =
-                                                                               RigFemResultAddress( RIG_NODAL,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_NODAL, "POR-Bar", "" ) );
-                                                                                                    "POR-Bar",
-                                                                                                    "" ) );
 
     RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
     const RigFemPart*         femPart       = m_femParts->part( partIndex );
@@ -2048,10 +2000,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateGamma( int
     frameCountProgress.incrementProgress();
     frameCountProgress.setNextProgressIncrement( this->frameCount() );
 
-    RigFemScalarResultFrames* srcPORDataFrames = this->findOrLoadScalarResult( partIndex,
+    RigFemScalarResultFrames* srcPORDataFrames =
-                                                                               RigFemResultAddress( RIG_NODAL,
+        this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_NODAL, "POR-Bar", "" ) );
-                                                                                                    "POR-Bar",
-                                                                                                    "" ) );
     RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr );
 
     frameCountProgress.incrementProgress();

ApplicationCode/GrpcInterface/RiaGrpcCommandService.cpp

@@ -193,8 +193,8 @@ void RiaGrpcCommandService::assignPdmFieldValue( caf::PdmValueField*    pdmValue
         {
             if ( paramDescriptor->is_repeated() )
             {
-                RepeatedFieldRef<std::string> repeatedField = reflection->GetRepeatedFieldRef<std::string>( params,
+                RepeatedFieldRef<std::string> repeatedField =
-                                                                                                            paramDescriptor );
+                    reflection->GetRepeatedFieldRef<std::string>( params, paramDescriptor );
                 std::vector<QString> stringVector;
                 for ( const std::string& string : repeatedField )
                 {

ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp

@@ -357,8 +357,8 @@ void Riv3dWellLogCurveGeometryGenerator::createNewVerticesAlongSegment( const cv
     {
         caf::Line<double> triangleEdge1 = caf::Line<double>( drawSurfaceVertices[j], drawSurfaceVertices[j + 1] );
         caf::Line<double> triangleEdge2 = caf::Line<double>( drawSurfaceVertices[j + 2], drawSurfaceVertices[j + 1] );
-        cvf::Vec3d triangleNormal = ( triangleEdge1.vector().getNormalized() ^ triangleEdge2.vector().getNormalized() )
+        cvf::Vec3d        triangleNormal =
-                                        .getNormalized();
+            ( triangleEdge1.vector().getNormalized() ^ triangleEdge2.vector().getNormalized() ).getNormalized();
 
         cvf::Vec3d currentSubSegment      = ptEnd - extraVertices->back();
         cvf::Vec3d projectedSegmentVector = currentSubSegment - ( currentSubSegment * triangleNormal ) * triangleNormal;

ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp

@@ -57,11 +57,8 @@ void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo( size_t
 
     // Create result access objects
 
-    cvf::ref<RigResultAccessor> cellCenterDataAccessObject = createCellCenterResultAccessor( cellResultColors,
+    cvf::ref<RigResultAccessor> cellCenterDataAccessObject =
-                                                                                             timeStepIndex,
+        createCellCenterResultAccessor( cellResultColors, timeStepIndex, eclipseCase, eclipseCase->grid( gridIndex ) );
-                                                                                             eclipseCase,
-                                                                                             eclipseCase->grid(
-                                                                                                 gridIndex ) );
     cvf::ref<RigResultAccessor> cellEdgeResultAccessor = createCellEdgeResultAccessor( cellResultColors,
                                                                                        cellEdgeResultColors,
                                                                                        timeStepIndex,

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]]
+                ( *cellVisibility )[lcIdx] |=
-                                                                        [masterCaseCells.cellIndex[mcIdx]];
+                    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<RivReservoirViewPartMgr*>( this ) )
+    RivReservoirPartMgr* pmgr =
-                                    ->reservoirPartManager( geometryType, timeStepIndex );
+        ( const_cast<RivReservoirViewPartMgr*>( this ) )->reservoirPartManager( geometryType, timeStepIndex );
 
     return pmgr->cellVisibility( gridIndex ).p();
 }

ApplicationCode/ModelVisualization/RivScalarMapperUtils.cpp

@@ -51,11 +51,8 @@ void RivScalarMapperUtils::applyTextureResultsToPart( cvf::Part*               p
     cvf::DrawableGeo* dg = dynamic_cast<cvf::DrawableGeo*>( part->drawable() );
     if ( dg ) dg->setTextureCoordArray( textureCoords );
 
-    cvf::ref<cvf::Effect> scalarEffect = RivScalarMapperUtils::createScalarMapperEffect( mapper,
+    cvf::ref<cvf::Effect> scalarEffect =
-                                                                                         opacityLevel,
+        RivScalarMapperUtils::createScalarMapperEffect( mapper, opacityLevel, faceCulling, disableLighting, undefColor );
-                                                                                         faceCulling,
-                                                                                         disableLighting,
-                                                                                         undefColor );
     part->setEffect( scalarEffect.p() );
 }
 

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,
+                    RigEclipseWellLogExtractor* extractor =
-                                                                                                              wellPath );
+                        RiaExtractionTools::findOrCreateSimWellExtractor( m_simWellInView, wellPath );
                     if ( extractor )
                     {
                         std::vector<WellPathCellIntersectionInfo> 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,
+                            const RigWellResultPoint* wResCell =
-                                                                                                           globalCellIndex );
+                                wResFrame.findResultCellWellHeadIncluded( 0, globalCellIndex );
 
                             if ( !wResCell || !wResCell->isValid() )
                             {

ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp

@@ -169,10 +169,8 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel( cvf::ModelBas
             }
         }
 
-        std::pair<double, double> injProdFluxPair   = flowResults->injectorProducerPairFluxes( injectorName,
+        std::pair<double, double> injProdFluxPair =
-                                                                                             producerName,
+            flowResults->injectorProducerPairFluxes( injectorName, producerName, static_cast<int>( frameIndex ) );
-                                                                                             static_cast<int>(
-                                                                                                 frameIndex ) );
         std::pair<double, double> injProdFluxPairXF = flowResults->injectorProducerPairFluxes( crossFlowInjectorName,
                                                                                                crossFlowProducerName,
                                                                                                static_cast<int>(
@@ -210,12 +208,8 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel( cvf::ModelBas
                     startPoint.z() -= 0.5 * characteristicCellSize;
                     endPoint.z() -= 0.5 * characteristicCellSize;
                 }
-                cvf::ref<cvf::Part> arrowPart = createArrowPart( startPoint,
+                cvf::ref<cvf::Part> arrowPart =
-                                                                 endPoint,
+                    createArrowPart( startPoint, endPoint, width, isProducer, arrowColor, enableLighting );
-                                                                 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<cvf::Part> arrowPart = createArrowPart( startPoint,
+                cvf::ref<cvf::Part> arrowPart =
-                                                                 endPoint,
+                    createArrowPart( startPoint, endPoint, widthXf, !isProducer, arrowColor, enableLighting );
-                                                                 widthXf,
-                                                                 !isProducer,
-                                                                 arrowColor,
-                                                                 enableLighting );
                 model->addPart( arrowPart.p() );
             }
         }

ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp

@@ -566,8 +566,8 @@ cvf::ref<cvf::Part> RivWellFracturePartMgr::createStimPlanElementColorSurfacePar
             QString resultNameFromColors = activeView.fractureColors()->uiResultName();
             QString resultUnitFromColors = activeView.fractureColors()->unit();
 
-            std::vector<double> prCellResults = stimPlanFracTemplate
+            std::vector<double> prCellResults =
-                                                    ->fractureGridResults( resultNameFromColors,
+                stimPlanFracTemplate->fractureGridResults( resultNameFromColors,
                                                            resultUnitFromColors,
                                                            stimPlanFracTemplate->activeTimeStepIndex() );
 
@@ -1046,8 +1046,8 @@ cvf::ref<cvf::DrawableGeo>
     QString resultNameFromColors = activeView.fractureColors()->uiResultName();
     QString resultUnitFromColors = activeView.fractureColors()->unit();
 
-    std::vector<double> prCellResults = stimPlanFracTemplate
+    std::vector<double> prCellResults =
-                                            ->fractureGridResults( resultNameFromColors,
+        stimPlanFracTemplate->fractureGridResults( resultNameFromColors,
                                                    resultUnitFromColors,
                                                    stimPlanFracTemplate->activeTimeStepIndex() );
 

ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp

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

ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp

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

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

ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp

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

ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp

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

ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp

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

ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp

@@ -269,9 +269,8 @@ std::vector<double> RimEclipseContourMapProjection::calculateColumnResult( Resul
         resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PORO" ), 0 );
     const std::vector<double>& ntgResults =
         resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "NTG" ), 0 );
-    const std::vector<double>& dzResults = resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE,
+    const std::vector<double>& dzResults =
-                                                                                                   "DZ" ),
+        resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ), 0 );
-                                                                          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 )
+        double lengthInCell =
-                                  .length();
+            ( intersections.back().m_intersectionPoint - intersections.front().m_intersectionPoint ).length();
         return lengthInCell;
     }
     return 0.0;

ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp

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

ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp

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

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<RigSimWellData>& sourceCaseSimWellData = sourceResultCase->eclipseCaseData()
+                const cvf::Collection<RigSimWellData>& sourceCaseSimWellData =
-                                                                                   ->wellResults();
+                    sourceResultCase->eclipseCaseData()->wellResults();
                 setWellResultsAndUpdateViews( sourceCaseSimWellData );
             }
         }

ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp

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

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(),
+    m_formationNamesFileName =
-                                                       newProjectPath,
+        RimTools::relocateFile( m_formationNamesFileName(), newProjectPath, oldProjectPath, nullptr, nullptr );
-                                                       oldProjectPath,
-                                                       nullptr,
-                                                       nullptr );
 }
 
 //--------------------------------------------------------------------------------------------------

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 )
+        double lengthInCell =
-                                  .length();
+            ( intersections.back().m_intersectionPoint - intersections.front().m_intersectionPoint ).length();
         return lengthInCell;
     }
     return 0.0;

ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp

@@ -235,8 +235,8 @@ QList<caf::PdmOptionItemInfo>
         {
             if ( m_geomCase->geoMechData() )
             {
-                size_t kCount = m_geomCase->geoMechData()->femParts()->part( 0 )->getOrCreateStructGrid()->gridPointCountK() -
+                size_t kCount =
-                                1;
+                    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 ) );

ApplicationCode/ProjectDataModel/RimProject.cpp

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

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<RimSummaryCase*>(
             caf::PdmReferenceHelper::objectFromReference( RiaApplication::instance()->project(),

ApplicationCode/ProjectDataModel/RimWellLogFile.cpp

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

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(),
+    m_summaryHeaderFilename =
-                                                      newProjectPath,
+        RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
-                                                      oldProjectPath,
-                                                      nullptr,
-                                                      nullptr );
 }
 
 //--------------------------------------------------------------------------------------------------

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(),
+    m_summaryHeaderFilename =
-                                                      newProjectPath,
+        RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
-                                                      oldProjectPath,
-                                                      nullptr,
-                                                      nullptr );
 }
 
 //--------------------------------------------------------------------------------------------------

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 ) )
+        addressUiText =
-                            .toStdString();
+            RiaStatisticsTools::replacePercentileByPValueText( QString::fromStdString( addressUiText ) ).toStdString();
     }
 
     if ( group && group->isEnsemble() )

ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp

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

ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp

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

ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp

@@ -79,8 +79,8 @@ void RigEclipseToStimPlanCalculator::computeValues()
                                                                                    reservoirCellIndicesOpenForFlow,
                                                                                    m_fracture );
 
-        const std::vector<size_t>& fractureCellContributingEclipseCells = eclToFractureTransCalc
+        const std::vector<size_t>& fractureCellContributingEclipseCells =
-                                                                              .globalIndiciesToContributingEclipseCells();
+            eclToFractureTransCalc.globalIndiciesToContributingEclipseCells();
 
         if ( !fractureCellContributingEclipseCells.empty() )
         {
@@ -99,8 +99,8 @@ void RigEclipseToStimPlanCalculator::appendDataToTransmissibilityCondenser( bool
 {
     for ( const auto& eclToFractureTransCalc : m_singleFractureCellCalculators )
     {
-        const std::vector<size_t>& fractureCellContributingEclipseCells = eclToFractureTransCalc.second
+        const std::vector<size_t>& fractureCellContributingEclipseCells =
-                                                                              .globalIndiciesToContributingEclipseCells();
+            eclToFractureTransCalc.second.globalIndiciesToContributingEclipseCells();
 
         const std::vector<double>& fractureCellContributingEclipseCellTransmissibilities =
             eclToFractureTransCalc.second.contributingEclipseCellTransmissibilities();

ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp

@@ -304,21 +304,24 @@ void RigEclipseToStimPlanCellTransmissibilityCalculator::calculateStimPlanCellsM
                 NTG = dataAccessObjectNTG->cellScalarGlobIdx( reservoirCellIndex );
             }
 
-            double transmissibility_X = RigFractureTransmissibilityEquations::matrixToFractureTrans( permY,
+            double transmissibility_X =
+                RigFractureTransmissibilityEquations::matrixToFractureTrans( permY,
                                                                              NTG,
                                                                              Ay,
                                                                              dx,
                                                                              m_fractureSkinFactor,
                                                                              fractureAreaWeightedlength,
                                                                              m_cDarcy );
-            double transmissibility_Y = RigFractureTransmissibilityEquations::matrixToFractureTrans( permX,
+            double transmissibility_Y =
+                RigFractureTransmissibilityEquations::matrixToFractureTrans( permX,
                                                                              NTG,
                                                                              Ax,
                                                                              dy,
                                                                              m_fractureSkinFactor,
                                                                              fractureAreaWeightedlength,
                                                                              m_cDarcy );
-            double transmissibility_Z = RigFractureTransmissibilityEquations::matrixToFractureTrans( permZ,
+            double transmissibility_Z =
+                RigFractureTransmissibilityEquations::matrixToFractureTrans( permZ,
                                                                              1.0,
                                                                              Az,
                                                                              dz,

ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp

@@ -226,10 +226,8 @@ std::map<size_t, double> RigTransmissibilityCondenser::calculateFicticiousFractu
             // Sum(T'_mf)
             double scaledMatrixToFractureTrans = matrixToAllFracturesTrans[globalMatrixCellIdx];
             // T'mw
-            double scaledMatrixToWellTrans = condensedTransmissibility( externalCell,
+            double scaledMatrixToWellTrans =
-                                                                        {true,
+                condensedTransmissibility( externalCell, {true, RigTransmissibilityCondenser::CellAddress::WELL, 1} );
-                                                                         RigTransmissibilityCondenser::CellAddress::WELL,
-                                                                         1} );
             // T'_fjw
             fictitiousFractureToWellTrans[globalMatrixCellIdx] =
                 RigFractureTransmissibilityEquations::effectiveInternalFractureToWellTransPDDHC( scaledMatrixToFractureTrans,

ApplicationCode/ReservoirDataModel/RigCaseCellResultCalculator.cpp

@@ -139,11 +139,8 @@ bool RigCaseCellResultCalculator::computeDifference( RigEclipseCaseData*
             cvf::ref<RigResultAccessor> sourceResultAccessor =
                 RigResultAccessorFactory::createFromResultAddress( sourceCase, gridIdx, porosityModel, fIdx, nativeAddress );
 
-            cvf::ref<RigResultModifier> resultModifier = RigResultModifierFactory::createResultModifier( sourceCase,
+            cvf::ref<RigResultModifier> resultModifier =
-                                                                                                         gridIdx,
+                RigResultModifierFactory::createResultModifier( sourceCase, gridIdx, porosityModel, fIdx, address );
-                                                                                                         porosityModel,
-                                                                                                         fIdx,
-                                                                                                         address );
 
             size_t baseFrameIdx = fIdx;
             if ( address.isTimeLapse() )

ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp

@@ -3030,10 +3030,11 @@ void RigCaseCellResultsData::copyResultsMetaDataFromMainCase( RigEclipseCaseData
                                                               std::vector<RimEclipseCase*>  destinationCases )
 {
     std::vector<RigEclipseResultAddress> resAddresses = mainCaseResultsData->results( poroModel )->existingResults();
-    std::vector<RigEclipseTimeStepInfo>  timeStepInfos = mainCaseResultsData->results( poroModel )
+    std::vector<RigEclipseTimeStepInfo>  timeStepInfos =
-                                                            ->timeStepInfos( resAddresses[0] );
+        mainCaseResultsData->results( poroModel )->timeStepInfos( resAddresses[0] );
 
-    const std::vector<RigEclipseResultInfo> resultInfos = mainCaseResultsData->results( poroModel )->infoForEachResultIndex();
+    const std::vector<RigEclipseResultInfo> resultInfos =
+        mainCaseResultsData->results( poroModel )->infoForEachResultIndex();
 
     for ( size_t i = 0; i < destinationCases.size(); i++ )
     {

ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.cpp

@@ -217,8 +217,8 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilterEndPoints( const RigRange
 
             if ( femIsDestination )
             {
-                rangeFilterMatches[cornerIdx]
+                rangeFilterMatches[cornerIdx].cellMatchType =
-                    .cellMatchType = findBestFemCellFromEclCell( eclGrid,
+                    findBestFemCellFromEclCell( eclGrid,
                                                 srcRangeCube[cornerIdx][0],
                                                 srcRangeCube[cornerIdx][1],
                                                 srcRangeCube[cornerIdx][2],
@@ -227,8 +227,8 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilterEndPoints( const RigRange
                                                 &( rangeFilterMatches[cornerIdx].ijk[1] ),
                                                 &( rangeFilterMatches[cornerIdx].ijk[2] ) );
 
-                rangeFilterMatches[diagIdx]
+                rangeFilterMatches[diagIdx].cellMatchType =
-                    .cellMatchType = findBestFemCellFromEclCell( eclGrid,
+                    findBestFemCellFromEclCell( eclGrid,
                                                 srcRangeCube[diagIdx][0],
                                                 srcRangeCube[diagIdx][1],
                                                 srcRangeCube[diagIdx][2],
@@ -239,8 +239,8 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilterEndPoints( const RigRange
             }
             else
             {
-                rangeFilterMatches[cornerIdx]
+                rangeFilterMatches[cornerIdx].cellMatchType =
-                    .cellMatchType = findBestEclCellFromFemCell( femPart,
+                    findBestEclCellFromFemCell( femPart,
                                                 srcRangeCube[cornerIdx][0],
                                                 srcRangeCube[cornerIdx][1],
                                                 srcRangeCube[cornerIdx][2],
@@ -249,8 +249,8 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilterEndPoints( const RigRange
                                                 &( rangeFilterMatches[cornerIdx].ijk[1] ),
                                                 &( rangeFilterMatches[cornerIdx].ijk[2] ) );
 
-                rangeFilterMatches[diagIdx]
+                rangeFilterMatches[diagIdx].cellMatchType =
-                    .cellMatchType = findBestEclCellFromFemCell( femPart,
+                    findBestEclCellFromFemCell( femPart,
                                                 srcRangeCube[diagIdx][0],
                                                 srcRangeCube[diagIdx][1],
                                                 srcRangeCube[diagIdx][2],

ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp

@@ -232,20 +232,16 @@ std::vector<double>* RigFlowDiagResults::calculateDerivedResult( const RigFlowDi
 std::vector<double>* RigFlowDiagResults::calculateAverageTOFResult( const RigFlowDiagResultAddress& resVarAddr,
                                                                     size_t                          timeStepIndex )
 {
-    std::vector<const std::vector<double>*> injectorTOFs = findResultsForSelectedTracers( resVarAddr,
+    std::vector<const std::vector<double>*> injectorTOFs =
-                                                                                          timeStepIndex,
+        findResultsForSelectedTracers( resVarAddr, timeStepIndex, RIG_FLD_TOF_RESNAME, RimFlowDiagSolution::INJECTOR );
-                                                                                          RIG_FLD_TOF_RESNAME,
-                                                                                          RimFlowDiagSolution::INJECTOR );
     std::vector<const std::vector<double>*> injectorFractions =
         findResultsForSelectedTracers( resVarAddr,
                                        timeStepIndex,
                                        RIG_FLD_CELL_FRACTION_RESNAME,
                                        RimFlowDiagSolution::INJECTOR );
 
-    std::vector<const std::vector<double>*> producerTOFs = findResultsForSelectedTracers( resVarAddr,
+    std::vector<const std::vector<double>*> producerTOFs =
-                                                                                          timeStepIndex,
+        findResultsForSelectedTracers( resVarAddr, timeStepIndex, RIG_FLD_TOF_RESNAME, RimFlowDiagSolution::PRODUCER );
-                                                                                          RIG_FLD_TOF_RESNAME,
-                                                                                          RimFlowDiagSolution::PRODUCER );
     std::vector<const std::vector<double>*> producerFractions =
         findResultsForSelectedTracers( resVarAddr,
                                        timeStepIndex,

ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp

@@ -733,8 +733,8 @@ std::vector<RigFlowDiagSolverInterface::RelPermCurve>
             {
                 scaling.enable = static_cast<unsigned char>( 0 );
             }
-            std::vector<Opm::FlowDiagnostics::Graph> graphArr = m_opmFlowDiagStaticData->m_eclSaturationFunc
+            std::vector<Opm::FlowDiagnostics::Graph> graphArr =
-                                                                    ->getSatFuncCurve( satFuncRequests,
+                m_opmFlowDiagStaticData->m_eclSaturationFunc->getSatFuncCurve( satFuncRequests,
                                                                                static_cast<int>( activeCellIndex ),
                                                                                scaling );
             for ( size_t i = 0; i < graphArr.size(); i++ )
@@ -786,8 +786,8 @@ std::vector<RigFlowDiagSolverInterface::PvtCurve>
         {
             // Bo
             {
-                std::vector<Opm::ECLPVT::PVTGraph> graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection
+                std::vector<Opm::ECLPVT::PVTGraph> graphArr =
-                                                                  ->getPvtCurve( Opm::ECLPVT::RawCurve::FVF,
+                    m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::FVF,
                                                                                    Opm::ECLPhaseIndex::Liquid,
                                                                                    static_cast<int>( activeCellIndex ) );
                 for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr )
@@ -802,8 +802,8 @@ std::vector<RigFlowDiagSolverInterface::PvtCurve>
 
             // Bg
             {
-                std::vector<Opm::ECLPVT::PVTGraph> graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection
+                std::vector<Opm::ECLPVT::PVTGraph> graphArr =
-                                                                  ->getPvtCurve( Opm::ECLPVT::RawCurve::FVF,
+                    m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::FVF,
                                                                                    Opm::ECLPhaseIndex::Vapour,
                                                                                    static_cast<int>( activeCellIndex ) );
                 for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr )
@@ -821,8 +821,8 @@ std::vector<RigFlowDiagSolverInterface::PvtCurve>
         {
             // Visc_o / mu_o
             {
-                std::vector<Opm::ECLPVT::PVTGraph> graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection
+                std::vector<Opm::ECLPVT::PVTGraph> graphArr =
-                                                                  ->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity,
+                    m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity,
                                                                                    Opm::ECLPhaseIndex::Liquid,
                                                                                    static_cast<int>( activeCellIndex ) );
                 for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr )
@@ -837,8 +837,8 @@ std::vector<RigFlowDiagSolverInterface::PvtCurve>
 
             // Visc_g / mu_g
             {
-                std::vector<Opm::ECLPVT::PVTGraph> graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection
+                std::vector<Opm::ECLPVT::PVTGraph> graphArr =
-                                                                  ->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity,
+                    m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity,
                                                                                    Opm::ECLPhaseIndex::Vapour,
                                                                                    static_cast<int>( activeCellIndex ) );
                 for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr )

ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp

@@ -162,8 +162,8 @@ cvf::ref<cvf::StructGridScalarDataAccess>
         return NULL;
     }
 
-    std::vector<std::vector<double>>& scalarSetResults = eclipseCase->results( porosityModel )
+    std::vector<std::vector<double>>& scalarSetResults =
-                                                             ->cellScalarResults( scalarSetIndex );
+        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

ApplicationCode/ReservoirDataModel/RigNNCData.cpp

@@ -159,7 +159,8 @@ 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,
+        bool foundOverlap =
+            cvf::GeometryTools::calculateOverlapPolygonOfTwoQuads( &polygon,
                                                                    &intersections,
                                                                    (cvf::EdgeIntersectStorage<size_t>*)nullptr,
                                                                    cvf::wrapArrayConst( &mainGrid.nodes() ),

ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp

@@ -141,8 +141,8 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
         flowrateKatAllTimeSteps.push_back( flowrateK );
 
         size_t                     nativeTimeStepIndex = caseToApply->uiToNativeTimeStepIndex( timeStep );
-        const std::vector<double>* connectionFlowrate = nncData->dynamicConnectionScalarResultByName( nncConnectionProperty,
+        const std::vector<double>* connectionFlowrate =
-                                                                                                      nativeTimeStepIndex );
+            nncData->dynamicConnectionScalarResultByName( nncConnectionProperty, nativeTimeStepIndex );
         flowrateNNCatAllTimeSteps.push_back( connectionFlowrate );
 
         // sum all tracers at current timestep

ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp

@@ -101,11 +101,8 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromResultAddress( c
         adjustedTimeStepIndex = 0;
     }
 
-    cvf::ref<RigResultAccessor> derivedCandidate = createCombinedResultAccessor( eclipseCase,
+    cvf::ref<RigResultAccessor> derivedCandidate =
-                                                                                 gridIndex,
+        createCombinedResultAccessor( eclipseCase, gridIndex, porosityModel, adjustedTimeStepIndex, resVarAddr );
-                                                                                 porosityModel,
-                                                                                 adjustedTimeStepIndex,
-                                                                                 resVarAddr );
 
     if ( derivedCandidate.notNull() ) return derivedCandidate;
 
@@ -136,19 +133,22 @@ cvf::ref<RigResultAccessor>
 
         cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor( grid );
         nativeAddr.m_resultName                                   = "TRANX";
-        cvf::ref<RigResultAccessor> xTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
+        cvf::ref<RigResultAccessor> xTransAccessor =
+            RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
                                                                      gridIndex,
                                                                      porosityModel,
                                                                      timeStepIndex,
                                                                      nativeAddr );
         nativeAddr.m_resultName = "TRANY";
-        cvf::ref<RigResultAccessor> yTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
+        cvf::ref<RigResultAccessor> yTransAccessor =
+            RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
                                                                      gridIndex,
                                                                      porosityModel,
                                                                      timeStepIndex,
                                                                      nativeAddr );
         nativeAddr.m_resultName = "TRANZ";
-        cvf::ref<RigResultAccessor> zTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
+        cvf::ref<RigResultAccessor> zTransAccessor =
+            RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
                                                                      gridIndex,
                                                                      porosityModel,
                                                                      timeStepIndex,
@@ -217,19 +217,22 @@ cvf::ref<RigResultAccessor>
         cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor( grid );
 
         nativeAddr.m_resultName = RiaDefines::riTranXResultName();
-        cvf::ref<RigResultAccessor> xTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
+        cvf::ref<RigResultAccessor> xTransAccessor =
+            RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
                                                                      gridIndex,
                                                                      porosityModel,
                                                                      timeStepIndex,
                                                                      nativeAddr );
         nativeAddr.m_resultName = RiaDefines::riTranYResultName();
-        cvf::ref<RigResultAccessor> yTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
+        cvf::ref<RigResultAccessor> yTransAccessor =
+            RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
                                                                      gridIndex,
                                                                      porosityModel,
                                                                      timeStepIndex,
                                                                      nativeAddr );
         nativeAddr.m_resultName = RiaDefines::riTranZResultName();
-        cvf::ref<RigResultAccessor> zTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
+        cvf::ref<RigResultAccessor> zTransAccessor =
+            RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase,
                                                                      gridIndex,
                                                                      porosityModel,
                                                                      timeStepIndex,
@@ -463,8 +466,8 @@ cvf::ref<RigResultAccessor>
         return nullptr;
     }
 
-    const std::vector<std::vector<double>>& scalarSetResults = eclipseCase->results( porosityModel )
+    const std::vector<std::vector<double>>& scalarSetResults =
-                                                                   ->cellScalarResults( resultAddress );
+        eclipseCase->results( porosityModel )->cellScalarResults( resultAddress );
 
     if ( timeStepIndex >= scalarSetResults.size() )
     {
@@ -485,10 +488,8 @@ cvf::ref<RigResultAccessor>
     bool useGlobalActiveIndex = eclipseCase->results( porosityModel )->isUsingGlobalActiveIndex( resultAddress );
     if ( useGlobalActiveIndex )
     {
-        cvf::ref<RigResultAccessor> object = new RigActiveCellsResultAccessor( grid,
+        cvf::ref<RigResultAccessor> object =
-                                                                               resultValues,
+            new RigActiveCellsResultAccessor( grid, resultValues, eclipseCase->activeCellInfo( porosityModel ) );
-                                                                               eclipseCase->activeCellInfo(
-                                                                                   porosityModel ) );
         return object;
     }
     else

ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp

@@ -68,9 +68,8 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier( RigE
     bool useGlobalActiveIndex = eclipseCase->results( porosityModel )->isUsingGlobalActiveIndex( resVarAddr );
     if ( useGlobalActiveIndex )
     {
-        cvf::ref<RigResultModifier> object = new RigActiveCellsResultModifier( grid,
+        cvf::ref<RigResultModifier> object =
-                                                                               eclipseCase->activeCellInfo( porosityModel ),
+            new RigActiveCellsResultModifier( grid, eclipseCase->activeCellInfo( porosityModel ), resultValues );
-                                                                               resultValues );
         return object;
     }
     else

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<RigWellResultPoint>& frameCells = m_wellCellsTimeSteps[0].m_wellResultBranches[bIdx].m_branchResultPoints;
+        const std::vector<RigWellResultPoint>& frameCells =
+            m_wellCellsTimeSteps[0].m_wellResultBranches[bIdx].m_branchResultPoints;
 
         std::list<RigWellResultPoint>& branch = staticWellBranches[branchErtId];
 

ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp

@@ -685,8 +685,8 @@ private:
         std::deque<size_t>   wellCellIndices = branchLineIt->second;
         if ( !startAtFront ) std::reverse( wellCellIndices.begin(), wellCellIndices.end() );
 
-        const std::vector<RigWellResultPoint>& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0]
+        const std::vector<RigWellResultPoint>& orgWellResultPoints =
-                                                                         .m_branchResultPoints;
+            m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints;
 
 #if 1
         if ( wellCellIndices.size() )
@@ -739,8 +739,8 @@ private:
     //--------------------------------------------------------------------------------------------------
     void buildCellSearchTree()
     {
-        const std::vector<RigWellResultPoint>& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0]
+        const std::vector<RigWellResultPoint>& orgWellResultPoints =
-                                                                         .m_branchResultPoints;
+            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<RigWellResultPoint>& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0]
+        const std::vector<RigWellResultPoint>& orgWellResultPoints =
-                                                                         .m_branchResultPoints;
+            m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints;
         size_t                         cellCount = orgWellResultPoints.size();
         const std::vector<cvf::Vec3d>& nodes     = m_eclipseCaseData->mainGrid()->nodes();
         double                         cellSizeI, cellSizeJ, cellSizeK;
@@ -837,8 +837,8 @@ private:
     //--------------------------------------------------------------------------------------------------
     void buildUnusedCellsSet()
     {
-        const std::vector<RigWellResultPoint>& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0]
+        const std::vector<RigWellResultPoint>& orgWellResultPoints =
-                                                                         .m_branchResultPoints;
+            m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints;
         size_t cellCount = orgWellResultPoints.size();
 
         for ( size_t i = 0; i < cellCount; ++i )
@@ -913,8 +913,8 @@ private:
     {
         size_t                                 posKNeighbor = cvf::UNDEFINED_SIZE_T;
         size_t                                 firstUnused  = cvf::UNDEFINED_SIZE_T;
-        const std::vector<RigWellResultPoint>& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0]
+        const std::vector<RigWellResultPoint>& orgWellResultPoints =
-                                                                         .m_branchResultPoints;
+            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<RigWellResultPoint>& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0]
+        const std::vector<RigWellResultPoint>& orgWellResultPoints =
-                                                                         .m_branchResultPoints;
+            m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints;
 
         const RigCell& c = m_eclipseCaseData->cellFromWellResultCell( orgWellResultPoints[wellCellIdx] );
 

ApplicationCode/ReservoirDataModel/RigWellPathGeometryTools.cpp

@@ -57,8 +57,8 @@ std::vector<cvf::Vec3d> RigWellPathGeometryTools::calculateLineSegmentNormals( c
         cvf::Vec3d normal( 0, 0, 0 );
         if ( cvf::Math::abs( tangent * projectionPlaneNormal ) < 0.7071 )
         {
-            cvf::Vec3d projectedTangent = ( tangent - ( tangent * projectionPlaneNormal ) * projectionPlaneNormal )
+            cvf::Vec3d projectedTangent =
-                                              .getNormalized();
+                ( tangent - ( tangent * projectionPlaneNormal ) * projectionPlaneNormal ).getNormalized();
             normal = ( projectedTangent ^ projectionPlaneNormal ).getNormalized();
             normal = normal.getTransformedVector( cvf::Mat3d::fromRotation( tangent, planeAngle ) );
         }
@@ -217,8 +217,8 @@ std::vector<cvf::Vec3d> RigWellPathGeometryTools::interpolateUndefinedNormals( c
             if ( lastNormalNonInterpolated.length() > 0.0 && nextNormal.length() > 0.0 )
             {
                 // Both last and next are acceptable, interpolate!
-                currentNormal = ( distanceToNext * lastNormalNonInterpolated + distanceFromLast * nextNormal )
+                currentNormal =
-                                    .getNormalized();
+                    ( distanceToNext * lastNormalNonInterpolated + distanceFromLast * nextNormal ).getNormalized();
             }
             else if ( lastNormalNonInterpolated.length() > 0.0 )
             {

ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp

@@ -661,8 +661,8 @@ public:
                     if ( activeCellInfo->isActive( gcIdx ) )
                     {
                         m_scalarResultsToAdd->at(
-                            m_requestedTimesteps[m_currentTimeStepNumberToRead] )[activeCellInfo->cellResultIndex(
+                            m_requestedTimesteps[m_currentTimeStepNumberToRead] )[activeCellInfo->cellResultIndex( gcIdx )] =
-                            gcIdx )] = readBuffer[acIdx];
+                            readBuffer[acIdx];
                         ++acIdx;
                     }
                 }
@@ -865,8 +865,8 @@ public:
             }
 
             m_currentResultAddress = resAddr;
-            scalarResultFrames     = rimCase->results( m_porosityModelEnum )
+            scalarResultFrames =
-                                     ->modifiableCellScalarResultTimesteps( m_currentResultAddress );
+                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()
+static bool RiaGetGridPropertyForSelectedCells_init =
-                                                          ->registerCreator<RiaGetGridPropertyForSelectedCells>(
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetGridPropertyForSelectedCells>(
         RiaGetGridPropertyForSelectedCells::commandName() );

ApplicationCode/SocketInterface/RiaWellDataCommands.cpp

@@ -298,8 +298,8 @@ public:
 
         for ( size_t bIdx = 0; bIdx < wellResFrame.m_wellResultBranches.size(); ++bIdx )
         {
-            const std::vector<RigWellResultPoint>& branchResPoints = wellResFrame.m_wellResultBranches[bIdx]
+            const std::vector<RigWellResultPoint>& branchResPoints =
-                                                                         .m_branchResultPoints;
+                wellResFrame.m_wellResultBranches[bIdx].m_branchResultPoints;
             for ( size_t rpIdx = 0; rpIdx < branchResPoints.size(); ++rpIdx )
             {
                 const RigWellResultPoint& resPoint = branchResPoints[rpIdx];

ApplicationCode/UnitTests/ObservedDataParser-Test.cpp

@@ -994,72 +994,72 @@ TEST( RifColumnBasedRsmspecParserTest, TestParsingOfDateString )
 {
     {
         QString                                             txt = "22.12.1900";
-        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
+        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
-            txt );
+            RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
 
         EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_DOT_SEPARATED, df );
     }
 
     {
         QString                                             txt = "22-12-1900";
-        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
+        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
-            txt );
+            RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
 
         EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_DASH_SEPARATED, df );
     }
 
     {
         QString                                             txt = "22/12/1900";
-        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
+        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
-            txt );
+            RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
 
         EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_SLASH_SEPARATED, df );
     }
 
     {
         QString                                             txt = "1900.12.24";
-        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
+        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
-            txt );
+            RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
 
         EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_YYYYMMDD_DOT_SEPARATED, df );
     }
 
     {
         QString                                             txt = "1900-12-24";
-        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
+        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
-            txt );
+            RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
 
         EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_YYYYMMDD_DASH_SEPARATED, df );
     }
 
     {
         QString                                             txt = "1900/12/24";
-        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
+        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
-            txt );
+            RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
 
         EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_YYYYMMDD_SLASH_SEPARATED, df );
     }
 
     {
         QString                                             txt = "12/22/1900";
-        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
+        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
-            txt );
+            RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
 
         EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_MMDDYYYY_SLASH_SEPARATED, df );
     }
 
     {
         QString                                             txt = "22/12/1900";
-        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
+        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
-            txt );
+            RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
 
         EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_SLASH_SEPARATED, df );
     }
 
     {
         QString                                             txt = "12/22/30";
-        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString(
+        RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df =
-            txt );
+            RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt );
 
         EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_MMDDYY_SLASH_SEPARATED, df );
     }

ApplicationCode/UnitTests/RiaCellDividingTools-Test.cpp

@@ -49,14 +49,11 @@ TEST( RiaCellDividingTools, flowDistanceCubicMainCell_AreaPointInCenter )
 
     double dist = RiaCellDividingTools::computeFlowDistance( mainCellCorners, point );
 
-    double expectedDist = ( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() +
+    double expectedDist =
-                            ( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() +
+        ( ( 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( 12.5, 17.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.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, 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() ) /
-                            ( 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,14 +69,11 @@ TEST( RiaCellDividingTools, flowDistanceCubicMainCell_AreaPointNearCorner )
 
     double dist = RiaCellDividingTools::computeFlowDistance( mainCellCorners, point );
 
-    double expectedDist = ( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() +
+    double expectedDist =
-                            ( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() +
+        ( ( 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( 12.5, 17.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.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, 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() ) /
-                            ( 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,14 +89,11 @@ TEST( RiaCellDividingTools, flowDistanceHighMainCell_AreaPointNearLowerCorner )
 
     double dist = RiaCellDividingTools::computeFlowDistance( mainCellCorners, point );
 
-    double expectedDist = ( ( cvf::Vec3d( 12.5, 12.5, 35 ) - point ).length() +
+    double expectedDist =
-                            ( cvf::Vec3d( 17.5, 12.5, 35 ) - point ).length() +
+        ( ( 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( 12.5, 17.5, 35 ) - point ).length() + ( cvf::Vec3d( 17.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, 12.5, 85 ) - point ).length() +
+          ( cvf::Vec3d( 12.5, 17.5, 85 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.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 );

ApplicationCode/UnitTests/RiaSummaryCurveAnalyzer-Test.cpp

@@ -35,11 +35,8 @@ TEST( RiaSummaryCurveAnalyzer, WellCompletions )
         addresses.push_back( adr );
     }
     {
-        RifEclipseSummaryAddress adr = RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name",
+        RifEclipseSummaryAddress adr =
-                                                                                        wellNameB,
+            RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameB, 5, 4, 30 );
-                                                                                        5,
-                                                                                        4,
-                                                                                        30 );
         addresses.push_back( adr );
     }
 

ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp

@@ -93,9 +93,8 @@ void RiuCvfOverlayItemWidget::updateFromOverlayItem( caf::TitledOverlayFrame* it
         cvf::ref<cvf::RenderbufferObject> rboColor = new cvf::RenderbufferObject( cvf::RenderbufferObject::RGBA,
                                                                                   width,
                                                                                   height );
-        cvf::ref<cvf::RenderbufferObject> rboDepth = new cvf::RenderbufferObject( cvf::RenderbufferObject::DEPTH_COMPONENT24,
+        cvf::ref<cvf::RenderbufferObject> rboDepth =
-                                                                                  width,
+            new cvf::RenderbufferObject( cvf::RenderbufferObject::DEPTH_COMPONENT24, width, height );
-                                                                                  height );
 
         fbo->attachDepthRenderbuffer( rboDepth.p() );
         fbo->attachColorRenderbuffer( 0, rboColor.p() );

ApplicationCode/UserInterface/RiuDragDrop.cpp

@@ -404,8 +404,8 @@ bool RiuDragDrop::handleWellLogPlotTrackDrop( Qt::DropAction       action,
                                               RimWellLogTrack*     trackTarget,
                                               int                  insertAtPosition )
 {
-    std::vector<RimWellLogFileChannel*> wellLogFileChannels = RiuTypedPdmObjects<RimWellLogFileChannel>::typedObjectsFromGroup(
+    std::vector<RimWellLogFileChannel*> wellLogFileChannels =
-        draggedObjects );
+        RiuTypedPdmObjects<RimWellLogFileChannel>::typedObjectsFromGroup( draggedObjects );
     if ( wellLogFileChannels.size() > 0 )
     {
         if ( action == Qt::CopyAction )