From e06b57ef556fed6d8da463b0dd1e94ccb3057838 Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Wed, 30 Sep 2020 14:02:48 +0200 Subject: [PATCH] Fixes following review --- .../GeoMechDataModel/RigFemPartResultCalculatorEV.cpp | 2 +- .../RigFemPartResultCalculatorPoreCompressibility.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEV.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEV.cpp index cdda3e8f81..72f5cb6a0a 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEV.cpp +++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEV.cpp @@ -60,7 +60,7 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorEV::calculate( int partIndex QString progressText = "Calculating " + QString::fromStdString( resAddr.fieldName + ": " + resAddr.componentName ); - caf::ProgressInfo frameCountProgress( static_cast( m_resultCollection->frameCount() ) * 4, "" ); + caf::ProgressInfo frameCountProgress( static_cast( m_resultCollection->frameCount() ) * 4, progressText ); auto loadFrameLambda = [&]( const QString& component ) { auto task = frameCountProgress.task( "Loading " + component, m_resultCollection->frameCount() ); diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp index aaf331f2e6..a7cd743077 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp +++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp @@ -91,12 +91,10 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorPoreCompressibility::calcula // Biot porelastic coefficient (alpha) RigFemScalarResultFrames* biotCoefficient = nullptr; + if ( !m_resultCollection->biotResultAddress().isEmpty() ) { - if ( !m_resultCollection->biotResultAddress().isEmpty() ) - { - biotCoefficient = loadFrameLambda( - RigFemResultAddress( RIG_ELEMENT, m_resultCollection->biotResultAddress().toStdString(), "" ) ); - } + biotCoefficient = loadFrameLambda( + RigFemResultAddress( RIG_ELEMENT, m_resultCollection->biotResultAddress().toStdString(), "" ) ); } QString youngsErrMsg = QString( "Failed to compute %1\n" ).arg( QString::fromStdString( resAddr.componentName ) );