mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
clang-format: Set column width to 140
* Set column width to 140 * Use c++20 * Remove redundant virtual
This commit is contained in:
Magne Sjaastad
GitHub
@@ -67,14 +67,10 @@ public:
|
||||
StaticFieldsInitializer()
|
||||
{
|
||||
// Init static list
|
||||
RimWellPlotTools::FLOW_DATA_NAMES.insert( RimWellPlotTools::OIL_CHANNEL_NAMES.begin(),
|
||||
RimWellPlotTools::OIL_CHANNEL_NAMES.end() );
|
||||
RimWellPlotTools::FLOW_DATA_NAMES.insert( RimWellPlotTools::GAS_CHANNEL_NAMES.begin(),
|
||||
RimWellPlotTools::GAS_CHANNEL_NAMES.end() );
|
||||
RimWellPlotTools::FLOW_DATA_NAMES.insert( RimWellPlotTools::WATER_CHANNEL_NAMES.begin(),
|
||||
RimWellPlotTools::WATER_CHANNEL_NAMES.end() );
|
||||
RimWellPlotTools::FLOW_DATA_NAMES.insert( RimWellPlotTools::TOTAL_CHANNEL_NAMES.begin(),
|
||||
RimWellPlotTools::TOTAL_CHANNEL_NAMES.end() );
|
||||
RimWellPlotTools::FLOW_DATA_NAMES.insert( RimWellPlotTools::OIL_CHANNEL_NAMES.begin(), RimWellPlotTools::OIL_CHANNEL_NAMES.end() );
|
||||
RimWellPlotTools::FLOW_DATA_NAMES.insert( RimWellPlotTools::GAS_CHANNEL_NAMES.begin(), RimWellPlotTools::GAS_CHANNEL_NAMES.end() );
|
||||
RimWellPlotTools::FLOW_DATA_NAMES.insert( RimWellPlotTools::WATER_CHANNEL_NAMES.begin(), RimWellPlotTools::WATER_CHANNEL_NAMES.end() );
|
||||
RimWellPlotTools::FLOW_DATA_NAMES.insert( RimWellPlotTools::TOTAL_CHANNEL_NAMES.begin(), RimWellPlotTools::TOTAL_CHANNEL_NAMES.end() );
|
||||
}
|
||||
} staticFieldsInitializer;
|
||||
|
||||
@@ -108,16 +104,14 @@ bool RimWellPlotTools::hasPressureData( RimWellPath* wellPath )
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::pair<RigEclipseResultAddress, QString>
|
||||
RimWellPlotTools::pressureResultDataInfo( const RigEclipseCaseData* eclipseCaseData )
|
||||
std::pair<RigEclipseResultAddress, QString> RimWellPlotTools::pressureResultDataInfo( const RigEclipseCaseData* eclipseCaseData )
|
||||
{
|
||||
if ( eclipseCaseData != nullptr )
|
||||
{
|
||||
for ( const auto& pressureDataName : PRESSURE_DATA_NAMES )
|
||||
{
|
||||
if ( eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
->hasResultEntry(
|
||||
RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, pressureDataName ) ) )
|
||||
->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, pressureDataName ) ) )
|
||||
{
|
||||
return std::make_pair( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, pressureDataName ),
|
||||
pressureDataName );
|
||||
@@ -282,8 +276,7 @@ std::vector<RimWellLogFile*> RimWellPlotTools::wellLogFilesContainingPressure( c
|
||||
for ( auto wellPath : wellPaths )
|
||||
{
|
||||
if ( !wellPathNameOrSimWellName.isEmpty() &&
|
||||
( wellPathNameOrSimWellName == wellPath->associatedSimulationWellName() ||
|
||||
wellPathNameOrSimWellName == wellPath->name() ) )
|
||||
( wellPathNameOrSimWellName == wellPath->associatedSimulationWellName() || wellPathNameOrSimWellName == wellPath->name() ) )
|
||||
{
|
||||
const std::vector<RimWellLogFile*> files = wellPath->wellLogFiles();
|
||||
|
||||
@@ -424,8 +417,7 @@ std::vector<RimSummaryCaseCollection*> RimWellPlotTools::rftEnsemblesForWell( co
|
||||
|
||||
for ( RimSummaryCaseCollection* summaryCaseColl : allSummaryCaseCollections )
|
||||
{
|
||||
if ( summaryCaseColl && summaryCaseColl->isEnsemble() &&
|
||||
!summaryCaseColl->rftTimeStepsForWell( simWellName ).empty() )
|
||||
if ( summaryCaseColl && summaryCaseColl->isEnsemble() && !summaryCaseColl->rftTimeStepsForWell( simWellName ).empty() )
|
||||
{
|
||||
rftEnsembles.push_back( summaryCaseColl );
|
||||
}
|
||||
@@ -476,9 +468,9 @@ std::vector<RimObservedFmuRftData*> RimWellPlotTools::observedFmuRftDataForWell(
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<RimObservedFmuRftData*> RimWellPlotTools::observedFmuRftData()
|
||||
{
|
||||
const RimProject* project = RimProject::current();
|
||||
RimObservedDataCollection* observedDataCollection =
|
||||
project->activeOilField() ? project->activeOilField()->observedDataCollection() : nullptr;
|
||||
const RimProject* project = RimProject::current();
|
||||
RimObservedDataCollection* observedDataCollection = project->activeOilField() ? project->activeOilField()->observedDataCollection()
|
||||
: nullptr;
|
||||
|
||||
if ( observedDataCollection )
|
||||
{
|
||||
@@ -509,9 +501,9 @@ std::vector<RimPressureDepthData*> RimWellPlotTools::pressureDepthDataForWell( c
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<RimPressureDepthData*> RimWellPlotTools::pressureDepthData()
|
||||
{
|
||||
const RimProject* project = RimProject::current();
|
||||
RimObservedDataCollection* observedDataCollection =
|
||||
project->activeOilField() ? project->activeOilField()->observedDataCollection() : nullptr;
|
||||
const RimProject* project = RimProject::current();
|
||||
RimObservedDataCollection* observedDataCollection = project->activeOilField() ? project->activeOilField()->observedDataCollection()
|
||||
: nullptr;
|
||||
|
||||
if ( observedDataCollection )
|
||||
{
|
||||
@@ -538,8 +530,7 @@ std::map<QDateTime, std::set<RifDataSourceForRftPlt>> RimWellPlotTools::timeStep
|
||||
{
|
||||
timeStepsMap.insert( std::make_pair( timeStep, std::set<RifDataSourceForRftPlt>() ) );
|
||||
}
|
||||
timeStepsMap[timeStep].insert(
|
||||
RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA, gridCase ) );
|
||||
timeStepsMap[timeStep].insert( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA, gridCase ) );
|
||||
}
|
||||
}
|
||||
return timeStepsMap;
|
||||
@@ -581,9 +572,7 @@ std::set<QDateTime> RimWellPlotTools::findMatchingOrAdjacentTimeSteps( const std
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::set<QDateTime> RimWellPlotTools::availableSimWellTimesteps( RimEclipseCase* eclCase,
|
||||
const QString& simWellName,
|
||||
bool addFirstReportTimestep )
|
||||
std::set<QDateTime> RimWellPlotTools::availableSimWellTimesteps( RimEclipseCase* eclCase, const QString& simWellName, bool addFirstReportTimestep )
|
||||
{
|
||||
if ( !eclCase || !eclCase->eclipseCaseData() ) return {};
|
||||
|
||||
@@ -619,10 +608,10 @@ RiaRftPltCurveDefinition RimWellPlotTools::curveDefFromCurve( const RimWellLogCu
|
||||
|
||||
if ( rftCurve != nullptr )
|
||||
{
|
||||
RimEclipseResultCase* rftCase = dynamic_cast<RimEclipseResultCase*>( rftCurve->eclipseResultCase() );
|
||||
RimSummaryCase* rftSummaryCase = rftCurve->summaryCase();
|
||||
RimSummaryCaseCollection* rftEnsemble = rftCurve->ensemble();
|
||||
RimObservedFmuRftData* rftFmuData = rftCurve->observedFmuRftData();
|
||||
RimEclipseResultCase* rftCase = dynamic_cast<RimEclipseResultCase*>( rftCurve->eclipseResultCase() );
|
||||
RimSummaryCase* rftSummaryCase = rftCurve->summaryCase();
|
||||
RimSummaryCaseCollection* rftEnsemble = rftCurve->ensemble();
|
||||
RimObservedFmuRftData* rftFmuData = rftCurve->observedFmuRftData();
|
||||
RimPressureDepthData* pressureDepthData = rftCurve->pressureDepthData();
|
||||
|
||||
const RifEclipseRftAddress rftAddress = rftCurve->rftAddress();
|
||||
@@ -631,8 +620,7 @@ RiaRftPltCurveDefinition RimWellPlotTools::curveDefFromCurve( const RimWellLogCu
|
||||
|
||||
if ( rftCase != nullptr )
|
||||
{
|
||||
return RiaRftPltCurveDefinition( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::RFT_SIM_WELL_DATA,
|
||||
rftCase ),
|
||||
return RiaRftPltCurveDefinition( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::RFT_SIM_WELL_DATA, rftCase ),
|
||||
wellName,
|
||||
timeStep );
|
||||
}
|
||||
@@ -662,15 +650,12 @@ RiaRftPltCurveDefinition RimWellPlotTools::curveDefFromCurve( const RimWellLogCu
|
||||
if ( gridCase != nullptr )
|
||||
{
|
||||
size_t timeStepIndex = gridCurve->currentTimeStep();
|
||||
const std::map<QDateTime, std::set<RifDataSourceForRftPlt>>& timeStepsMap =
|
||||
timeStepsMapFromGridCase( gridCase );
|
||||
auto timeStepsVector =
|
||||
std::vector<std::pair<QDateTime, std::set<RifDataSourceForRftPlt>>>( timeStepsMap.begin(),
|
||||
timeStepsMap.end() );
|
||||
const std::map<QDateTime, std::set<RifDataSourceForRftPlt>>& timeStepsMap = timeStepsMapFromGridCase( gridCase );
|
||||
auto timeStepsVector =
|
||||
std::vector<std::pair<QDateTime, std::set<RifDataSourceForRftPlt>>>( timeStepsMap.begin(), timeStepsMap.end() );
|
||||
if ( timeStepIndex < timeStepsMap.size() )
|
||||
{
|
||||
return RiaRftPltCurveDefinition( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA,
|
||||
gridCase ),
|
||||
return RiaRftPltCurveDefinition( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA, gridCase ),
|
||||
gridCurve->wellName(),
|
||||
timeStepsVector[timeStepIndex].first );
|
||||
}
|
||||
@@ -736,10 +721,10 @@ bool RimWellPlotTools::tryMatchChannelName( const std::set<QString>& channelName
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::set<RiaRftPltCurveDefinition>
|
||||
RimWellPlotTools::curveDefsFromTimesteps( const QString& wellPathNameOrSimWellName,
|
||||
const std::vector<QDateTime>& selectedTimeSteps,
|
||||
bool firstSimWellTimeStepIsValid,
|
||||
const std::vector<RifDataSourceForRftPlt>& selectedSourcesExpanded,
|
||||
RimWellPlotTools::curveDefsFromTimesteps( const QString& wellPathNameOrSimWellName,
|
||||
const std::vector<QDateTime>& selectedTimeSteps,
|
||||
bool firstSimWellTimeStepIsValid,
|
||||
const std::vector<RifDataSourceForRftPlt>& selectedSourcesExpanded,
|
||||
const std::set<RifEclipseRftAddress::RftWellLogChannelType>& interestingRFTResults )
|
||||
{
|
||||
std::set<RiaRftPltCurveDefinition> curveDefs;
|
||||
@@ -789,8 +774,7 @@ std::set<RiaRftPltCurveDefinition>
|
||||
RimObservedFmuRftData* observedFmuRftData = addr.observedFmuRftData();
|
||||
if ( observedFmuRftData && observedFmuRftData->rftReader() )
|
||||
{
|
||||
std::set<QDateTime> timeSteps =
|
||||
observedFmuRftData->rftReader()->availableTimeSteps( wellPathNameOrSimWellName );
|
||||
std::set<QDateTime> timeSteps = observedFmuRftData->rftReader()->availableTimeSteps( wellPathNameOrSimWellName );
|
||||
for ( const QDateTime& time : timeSteps )
|
||||
{
|
||||
if ( selectedTimeStepSet.count( time ) )
|
||||
@@ -803,8 +787,7 @@ std::set<RiaRftPltCurveDefinition>
|
||||
RimPressureDepthData* pressureDepthData = addr.pressureDepthData();
|
||||
if ( pressureDepthData && pressureDepthData->rftReader() )
|
||||
{
|
||||
std::set<QDateTime> timeSteps =
|
||||
pressureDepthData->rftReader()->availableTimeSteps( wellPathNameOrSimWellName );
|
||||
std::set<QDateTime> timeSteps = pressureDepthData->rftReader()->availableTimeSteps( wellPathNameOrSimWellName );
|
||||
for ( const QDateTime& time : timeSteps )
|
||||
{
|
||||
if ( selectedTimeStepSet.count( time ) )
|
||||
@@ -823,8 +806,7 @@ std::set<RiaRftPltCurveDefinition>
|
||||
{
|
||||
RifDataSourceForRftPlt summaryAddr( summaryCase, addr.ensemble() );
|
||||
|
||||
std::set<QDateTime> timeSteps =
|
||||
summaryCase->rftReader()->availableTimeSteps( wellPathNameOrSimWellName );
|
||||
std::set<QDateTime> timeSteps = summaryCase->rftReader()->availableTimeSteps( wellPathNameOrSimWellName );
|
||||
for ( const QDateTime& time : timeSteps )
|
||||
{
|
||||
if ( selectedTimeStepSet.count( time ) )
|
||||
@@ -872,8 +854,7 @@ std::set<RiaRftPltCurveDefinition>
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RimWellPlotTools::flowPlotAxisTitle( RimWellLogFile::WellFlowCondition condition,
|
||||
RiaDefines::EclipseUnitSystem unitSystem )
|
||||
QString RimWellPlotTools::flowPlotAxisTitle( RimWellLogFile::WellFlowCondition condition, RiaDefines::EclipseUnitSystem unitSystem )
|
||||
{
|
||||
QString axisTitle;
|
||||
|
||||
@@ -921,8 +902,7 @@ QString flowConditionReservoirUnitText( RiaDefines::EclipseUnitSystem unitSystem
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RimWellPlotTools::flowUnitText( RimWellLogFile::WellFlowCondition condition,
|
||||
RiaDefines::EclipseUnitSystem unitSystem )
|
||||
QString RimWellPlotTools::flowUnitText( RimWellLogFile::WellFlowCondition condition, RiaDefines::EclipseUnitSystem unitSystem )
|
||||
{
|
||||
QString unitText;
|
||||
|
||||
@@ -954,8 +934,7 @@ QString RimWellPlotTools::flowUnitText( RimWellLogFile::WellFlowCondition condit
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RimWellPlotTools::flowVolumePlotAxisTitle( RimWellLogFile::WellFlowCondition condition,
|
||||
RiaDefines::EclipseUnitSystem unitSystem )
|
||||
QString RimWellPlotTools::flowVolumePlotAxisTitle( RimWellLogFile::WellFlowCondition condition, RiaDefines::EclipseUnitSystem unitSystem )
|
||||
{
|
||||
QString axisTitle;
|
||||
|
||||
@@ -1003,8 +982,7 @@ QString flowVolumeConditionReservoirUnitText( RiaDefines::EclipseUnitSystem unit
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RimWellPlotTools::flowVolumeUnitText( RimWellLogFile::WellFlowCondition condition,
|
||||
RiaDefines::EclipseUnitSystem unitSystem )
|
||||
QString RimWellPlotTools::flowVolumeUnitText( RimWellLogFile::WellFlowCondition condition, RiaDefines::EclipseUnitSystem unitSystem )
|
||||
{
|
||||
QString unitText;
|
||||
|
||||
@@ -1036,9 +1014,7 @@ QString RimWellPlotTools::flowVolumeUnitText( RimWellLogFile::WellFlowCondition
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RimWellPlotTools::curveUnitText( RimWellLogFile::WellFlowCondition condition,
|
||||
RiaDefines::EclipseUnitSystem unitSystem,
|
||||
FlowPhase flowPhase )
|
||||
QString RimWellPlotTools::curveUnitText( RimWellLogFile::WellFlowCondition condition, RiaDefines::EclipseUnitSystem unitSystem, FlowPhase flowPhase )
|
||||
{
|
||||
QString unitText;
|
||||
|
||||
@@ -1095,10 +1071,10 @@ QString RimWellPlotTools::curveUnitText( RimWellLogFile::WellFlowCondition condi
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::map<QDateTime, std::set<RifDataSourceForRftPlt>> RimWellPlotTools::calculateRelevantTimeStepsFromCases(
|
||||
const QString& wellPathNameOrSimWellName,
|
||||
const std::vector<RifDataSourceForRftPlt>& selSources,
|
||||
const std::set<RifEclipseRftAddress::RftWellLogChannelType>& interestingRFTResults )
|
||||
std::map<QDateTime, std::set<RifDataSourceForRftPlt>>
|
||||
RimWellPlotTools::calculateRelevantTimeStepsFromCases( const QString& wellPathNameOrSimWellName,
|
||||
const std::vector<RifDataSourceForRftPlt>& selSources,
|
||||
const std::set<RifEclipseRftAddress::RftWellLogChannelType>& interestingRFTResults )
|
||||
{
|
||||
bool addFirstTimestep = ( interestingRFTResults.count( RifEclipseRftAddress::RftWellLogChannelType::PRESSURE ) == 1 );
|
||||
|
||||
@@ -1212,8 +1188,7 @@ std::map<QDateTime, std::set<RifDataSourceForRftPlt>> RimWellPlotTools::calculat
|
||||
if ( source.sourceType() == RifDataSourceForRftPlt::SourceType::SUMMARY_RFT && source.summaryCase() &&
|
||||
source.summaryCase()->rftReader() )
|
||||
{
|
||||
std::set<QDateTime> wellTimeSteps =
|
||||
source.summaryCase()->rftReader()->availableTimeSteps( wellPathNameOrSimWellName );
|
||||
std::set<QDateTime> wellTimeSteps = source.summaryCase()->rftReader()->availableTimeSteps( wellPathNameOrSimWellName );
|
||||
|
||||
for ( const QDateTime& date : wellTimeSteps )
|
||||
{
|
||||
@@ -1283,10 +1258,8 @@ std::map<QDateTime, std::set<RifDataSourceForRftPlt>> RimWellPlotTools::calculat
|
||||
for ( const auto& dateSourceSetPair : ensembleTimeStepsWithSources )
|
||||
ensembleRftTimeSteps.insert( dateSourceSetPair.first );
|
||||
|
||||
std::set<QDateTime> filteredRftTimeSteps =
|
||||
RimWellPlotTools::findMatchingOrAdjacentTimeSteps( baseTimeSteps, rftTimeSteps );
|
||||
std::set<QDateTime> filteredGridTimeSteps =
|
||||
RimWellPlotTools::findMatchingOrAdjacentTimeSteps( baseTimeSteps, gridTimeSteps );
|
||||
std::set<QDateTime> filteredRftTimeSteps = RimWellPlotTools::findMatchingOrAdjacentTimeSteps( baseTimeSteps, rftTimeSteps );
|
||||
std::set<QDateTime> filteredGridTimeSteps = RimWellPlotTools::findMatchingOrAdjacentTimeSteps( baseTimeSteps, gridTimeSteps );
|
||||
std::set<QDateTime> filteredEnsembleRftTimeSteps =
|
||||
RimWellPlotTools::findMatchingOrAdjacentTimeSteps( baseTimeSteps, ensembleRftTimeSteps );
|
||||
std::set<QDateTime> filteredSummaryRftTimeSteps =
|
||||
@@ -1347,14 +1320,12 @@ std::map<QDateTime, std::set<RifDataSourceForRftPlt>> RimWellPlotTools::calculat
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimWellPlotTools::calculateValueOptionsForTimeSteps(
|
||||
const QString& wellPathNameOrSimWellName,
|
||||
const std::vector<RifDataSourceForRftPlt>& selSources,
|
||||
const std::set<RifEclipseRftAddress::RftWellLogChannelType>& interestingRFTResults,
|
||||
QList<caf::PdmOptionItemInfo>& options )
|
||||
void RimWellPlotTools::calculateValueOptionsForTimeSteps( const QString& wellPathNameOrSimWellName,
|
||||
const std::vector<RifDataSourceForRftPlt>& selSources,
|
||||
const std::set<RifEclipseRftAddress::RftWellLogChannelType>& interestingRFTResults,
|
||||
QList<caf::PdmOptionItemInfo>& options )
|
||||
{
|
||||
auto timestepsToShowWithSources =
|
||||
calculateRelevantTimeStepsFromCases( wellPathNameOrSimWellName, selSources, interestingRFTResults );
|
||||
auto timestepsToShowWithSources = calculateRelevantTimeStepsFromCases( wellPathNameOrSimWellName, selSources, interestingRFTResults );
|
||||
|
||||
// Create formatted options of all the time steps
|
||||
QString dateFormatString;
|
||||
|
||||
Reference in New Issue
Block a user