OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

#13126 RiaLogging: Use std::string_view instead of QString for logging

Browse Source
This commit is contained in:
Kristian Bendiksen
2026-05-08 10:11:09 +02:00
parent 4957bf5a8b
commit 5ffcb69acc
231 changed files with 1082 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp
+14 -11
View File
@@ -22,6 +22,7 @@
#include "RiaDefines.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RiaQStringFormatter.h"
#include "RiaWeightedGeometricMeanCalculator.h"
#include "RiaWeightedHarmonicMeanCalculator.h"
@@ -345,7 +346,7 @@ void RimEnsembleFractureStatistics::loadAndUpdateData()
CAF_ASSERT( area.size() == conductivity.size() );
for ( size_t i = 0; i < okFilePaths.size(); i++ )
{
RiaLogging::info( QString( "%1 Area: %2 Conductivity: %3" ).arg( okFilePaths[i] ).arg( area[i] ).arg( conductivity[i] ) );
RiaLogging::info( std::format( "{} Area: {} Conductivity: {}", okFilePaths[i], area[i], conductivity[i] ) );
}
if ( m_excludeZeroWidthFractures() )
@@ -353,7 +354,7 @@ void RimEnsembleFractureStatistics::loadAndUpdateData()
size_t numBeforeFiltering = stimPlanFractureDefinitions.size();
stimPlanFractureDefinitions = RigEnsembleFractureStatisticsCalculator::removeZeroWidthDefinitions( stimPlanFractureDefinitions );
size_t numRemoved = numBeforeFiltering - stimPlanFractureDefinitions.size();
RiaLogging::info( QString( "Excluded %1 zero width fractures." ).arg( numRemoved ) );
RiaLogging::info( std::format( "Excluded {} zero width fractures.", numRemoved ) );
}
m_statisticsTable = generateStatisticsTable( stimPlanFractureDefinitions );
@@ -400,11 +401,11 @@ std::vector<QString> RimEnsembleFractureStatistics::computeStatistics()
std::vector<double> gridXs;
std::vector<double> gridYs;
auto [minX, maxX, minY, maxY] = findSamplingIntervals( stimPlanFractureDefinitions, gridXs, gridYs );
RiaLogging::info( QString( "Ensemble Fracture Size: X = [%1, %2] Y = [%3, %4]" ).arg( minX ).arg( maxX ).arg( minY ).arg( maxY ) );
RiaLogging::info( std::format( "Ensemble Fracture Size: X = [{}, {}] Y = [{}, {}]", minX, maxX, minY, maxY ) );
for ( auto result : availableResults )
{
RiaLogging::info( QString( "Creating statistics for result: %1" ).arg( result.first ) );
RiaLogging::info( std::format( "Creating statistics for result: {}", result.first ) );
std::vector<cvf::cref<RigFractureGrid>> fractureGrids =
createFractureGrids( stimPlanFractureDefinitions, unitSystem, result.first, m_meshAlignmentType() );
@@ -473,7 +474,7 @@ std::vector<QString> RimEnsembleFractureStatistics::computeStatistics()
for ( double depth : gridYs )
gridYsWithOffset.push_back( referenceDepth - depth );
RiaLogging::info( QString( "Writing fracture group statistics to: %1" ).arg( xmlFilePath ) );
RiaLogging::info( std::format( "Writing fracture group statistics to: {}", xmlFilePath ) );
RifEnsembleFractureStatisticsExporter::writeAsStimPlanXml( statisticsSlices,
properties,
xmlFilePath,
@@ -510,7 +511,7 @@ std::pair<std::vector<cvf::ref<RigStimPlanFractureDefinition>>, std::vector<QStr
std::vector<QString> okFilePaths;
for ( auto filePath : m_filePaths.v() )
{
RiaLogging::info( QString( "Loading file: %1" ).arg( filePath.path() ) );
RiaLogging::info( std::format( "Loading file: {}", filePath.path() ) );
QString errorMessage;
cvf::ref<RigStimPlanFractureDefinition> stimPlanFractureDefinitionData =
RifStimPlanXmlReader::readStimPlanXMLFile( filePath.path(),
@@ -520,7 +521,7 @@ std::pair<std::vector<cvf::ref<RigStimPlanFractureDefinition>>, std::vector<QStr
&errorMessage );
if ( !errorMessage.isEmpty() )
{
RiaLogging::error( QString( "Error when reading file: '%1'" ).arg( errorMessage ) );
RiaLogging::error( std::format( "Error when reading file: '{}'", errorMessage ) );
}
if ( stimPlanFractureDefinitionData.notNull() )
@@ -676,7 +677,8 @@ void RimEnsembleFractureStatistics::generateUniformMesh( double mi
.arg( numSamplesX )
.arg( numSamplesY )
.arg( sampleDistanceX )
.arg( sampleDistanceY ) );
.arg( sampleDistanceY )
.toStdString() );
}
//--------------------------------------------------------------------------------------------------
@@ -747,7 +749,7 @@ void RimEnsembleFractureStatistics::generateAdaptiveMesh( double minX,
double binSize = totalDepth / targetNumLayers;
RiaLogging::info(
QString( "Adaptive mesh. Total depth: %1. Number of layers: %2. Layer thickness: %3" ).arg( totalDepth ).arg( targetNumLayers ).arg( binSize ) );
std::format( "Adaptive mesh. Total depth: {}. Number of layers: {}. Layer thickness: {}", totalDepth, targetNumLayers, binSize ) );
std::vector<double> baseDepth;
std::vector<double> means;
@@ -856,7 +858,8 @@ void RimEnsembleFractureStatistics::computeMeanThicknessPerLayer( const std::vec
.arg( nMatches )
.arg( arithmeticMean )
.arg( harmonicMean )
.arg( geometricMean ) );
.arg( geometricMean )
.toStdString() );
double mean = std::numeric_limits<double>::infinity();
if ( m_adaptiveMeanType() == MeanType::HARMONIC )
@@ -1251,7 +1254,7 @@ std::shared_ptr<RigSlice2D> RimEnsembleFractureStatistics::setCellsToFillTargetA
}
}
RiaLogging::info( QString( "Statistics fracture area: %1 target area: %2" ).arg( area ).arg( targetArea ) );
RiaLogging::info( std::format( "Statistics fracture area: {} target area: {}", area, targetArea ) );
return outputGrid;
}
ApplicationLibCode/ProjectDataModel/Completions/RimMswSegmentCollection.cpp
+2 -2
View File
@@ -162,7 +162,7 @@ void RimMswSegmentCollection::updateSegments( RimWellPath* topLevelWell, RimEcli
if ( !tableDataResult.has_value() )
{
RiaLogging::error( QString::fromStdString( tableDataResult.error() ) );
RiaLogging::error( tableDataResult.error() );
scheduleRedraw();
return;
}
@@ -183,7 +183,7 @@ void RimMswSegmentCollection::updateSegments( RimWellPath* topLevelWell, RimEcli
if ( !targetWellPath )
{
RiaLogging::warning(
QString( "Unable to find well path '%1' for MSW segment update." ).arg( QString::fromStdString( sourceWellName ) ) );
QString( "Unable to find well path '%1' for MSW segment update." ).arg( QString::fromStdString( sourceWellName ) ).toStdString() );
continue;
}
ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
+9 -6
View File
@@ -23,6 +23,7 @@
#include "RiaEclipseUnitTools.h"
#include "RiaFractureDefines.h"
#include "RiaLogging.h"
#include "RiaQStringFormatter.h"
#include "RiaWeightedGeometricMeanCalculator.h"
#include "RiaWeightedMeanCalculator.h"
@@ -104,7 +105,7 @@ void RimStimPlanFractureTemplate::setDefaultsBasedOnFile()
computeDepthOfWellPathAtFracture();
computePerforationLength();
RiaLogging::info( QString( "Setting well/fracture intersection depth at %1" ).arg( m_wellPathDepthAtFracture() ) );
RiaLogging::info( std::format( "Setting well/fracture intersection depth at {}", m_wellPathDepthAtFracture() ) );
m_activeTimeStepIndex = static_cast<int>( m_stimPlanFractureDefinitionData->totalNumberTimeSteps() - 1 );
@@ -112,9 +113,10 @@ void RimStimPlanFractureTemplate::setDefaultsBasedOnFile()
if ( polygonPropertySet )
RiaLogging::info( QString( "Calculating polygon outline based on %1 at timestep %2" )
.arg( m_borderPolygonResultName )
.arg( m_stimPlanFractureDefinitionData->timeSteps()[m_activeTimeStepIndex] ) );
.arg( m_stimPlanFractureDefinitionData->timeSteps()[m_activeTimeStepIndex] )
.toStdString() );
else
RiaLogging::info( QString( "Property for polygon calculation not set." ) );
RiaLogging::info( "Property for polygon calculation not set." );
if ( m_stimPlanFractureDefinitionData->orientation() == RigStimPlanFractureDefinition::Orientation::TRANSVERSE )
{
@@ -178,7 +180,7 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate()
RifStimPlanXmlReader::MirrorMode::MIRROR_AUTO,
fractureTemplateUnit(),
&errorMessage );
if ( errorMessage.size() > 0 ) RiaLogging::error( errorMessage );
if ( errorMessage.size() > 0 ) RiaLogging::error( errorMessage.toStdString() );
if ( m_stimPlanFractureDefinitionData.notNull() )
{
@@ -491,9 +493,10 @@ void RimStimPlanFractureTemplate::convertToUnitSystem( RiaDefines::EclipseUnitSy
if ( polygonPropertySet )
RiaLogging::info( QString( "Calculating polygon outline based on %1 at timestep %2" )
.arg( m_borderPolygonResultName )
.arg( m_stimPlanFractureDefinitionData->timeSteps()[m_activeTimeStepIndex] ) );
.arg( m_stimPlanFractureDefinitionData->timeSteps()[m_activeTimeStepIndex] )
.toStdString() );
else
RiaLogging::info( QString( "Property for polygon calculation not set." ) );
RiaLogging::info( "Property for polygon calculation not set." );
if ( !m_stimPlanFractureDefinitionData->conductivityResultNames().isEmpty() )
{
ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp
+15 -9
View File
@@ -23,6 +23,7 @@
#include "RiaEclipseUnitTools.h"
#include "RiaFractureDefines.h"
#include "RiaLogging.h"
#include "RiaQStringFormatter.h"
#include "RiaThermalFractureDefines.h"
#include "RifThermalFractureReader.h"
@@ -102,7 +103,7 @@ void RimThermalFractureTemplate::setDefaultsBasedOnFile()
computeDepthOfWellPathAtFracture();
computePerforationLength();
RiaLogging::info( QString( "Setting well/fracture intersection depth at %1" ).arg( m_wellPathDepthAtFracture() ) );
RiaLogging::info( std::format( "Setting well/fracture intersection depth at {}", m_wellPathDepthAtFracture() ) );
m_activeTimeStepIndex = static_cast<int>( m_fractureDefinitionData->numTimeSteps() - 1 );
@@ -110,9 +111,10 @@ void RimThermalFractureTemplate::setDefaultsBasedOnFile()
if ( polygonPropertySet )
RiaLogging::info( QString( "Calculating polygon outline based on %1 at timestep %2" )
.arg( m_borderPolygonResultName )
.arg( m_fractureDefinitionData->timeSteps()[m_activeTimeStepIndex] ) );
.arg( m_fractureDefinitionData->timeSteps()[m_activeTimeStepIndex] )
.toStdString() );
else
RiaLogging::info( QString( "Property for polygon calculation not set." ) );
RiaLogging::info( "Property for polygon calculation not set." );
QStringList resultNames = conductivityResultNames();
if ( !resultNames.isEmpty() )
@@ -173,7 +175,7 @@ void RimThermalFractureTemplate::loadDataAndUpdate()
if ( m_readError ) return;
auto [fractureDefinitionData, errorMessage] = RifThermalFractureReader::readFractureCsvFile( m_stimPlanFileName().path() );
if ( errorMessage.size() > 0 ) RiaLogging::error( errorMessage );
if ( errorMessage.size() > 0 ) RiaLogging::error( errorMessage.toStdString() );
m_fractureDefinitionData = fractureDefinitionData;
if ( m_fractureDefinitionData )
@@ -530,9 +532,10 @@ void RimThermalFractureTemplate::convertToUnitSystem( RiaDefines::EclipseUnitSys
if ( polygonPropertySet )
RiaLogging::info( QString( "Calculating polygon outline based on %1 at timestep %2" )
.arg( m_borderPolygonResultName )
.arg( m_fractureDefinitionData->timeSteps()[m_activeTimeStepIndex] ) );
.arg( m_fractureDefinitionData->timeSteps()[m_activeTimeStepIndex] )
.toStdString() );
else
RiaLogging::info( QString( "Property for polygon calculation not set." ) );
RiaLogging::info( "Property for polygon calculation not set." );
if ( !conductivityResultNames().isEmpty() )
{
@@ -800,9 +803,12 @@ bool RimThermalFractureTemplate::placeFractureUsingTemplateData( RimFracture* fr
double md = wellPathGeometry->closestMeasuredDepth( centerPosition );
RiaLogging::info(
QString( "Placing thermal fracture. Position: [%1 %2 %3]" ).arg( centerPosition.x() ).arg( centerPosition.y() ).arg( centerPosition.z() ) );
RiaLogging::info( QString( "Computed MD: %1" ).arg( md ) );
RiaLogging::info( QString( "Placing thermal fracture. Position: [%1 %2 %3]" )
.arg( centerPosition.x() )
.arg( centerPosition.y() )
.arg( centerPosition.z() )
.toStdString() );
RiaLogging::info( std::format( "Computed MD: {}", md ) );
RimWellPathFracture* wellPathFracture = dynamic_cast<RimWellPathFracture*>( fracture );
if ( wellPathFracture ) wellPathFracture->setMeasuredDepth( md );