OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

clang-format : Apply clang-fomat on ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad 2019-12-19 11:11:33 +01:00
parent 260ff04b19
commit 4ccbd274b8
12 changed files with 437 additions and 390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/RicPickEventHandler.h
View File

@ -41,7 +41,9 @@ class Rim3dView;
class Ric3dPickEvent : public caf::PickEvent
{
public:
Ric3dPickEvent( const std::vector<RiuPickItemInfo>& pickItemInfos, Rim3dView* view, Qt::KeyboardModifiers keyboardModifiers)
Ric3dPickEvent( const std::vector<RiuPickItemInfo>& pickItemInfos,
Rim3dView* view,
Qt::KeyboardModifiers keyboardModifiers )
: m_pickItemInfos( pickItemInfos )
, m_view( view )
, m_keyboardModifiers( keyboardModifiers )

1
ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.h
View File

@ -27,7 +27,6 @@ class RimFlowCharacteristicsPlot;
class RimWellDistributionPlot;
class RimWellDistributionPlotCollection;
//==================================================================================================
///
///

57
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp
View File

@ -18,8 +18,8 @@
#include "RimWellDistributionPlot.h"
#include "RimEclipseResultCase.h"
#include "RimProject.h"
#include "RimFlowDiagSolution.h"
#include "RimProject.h"
#include "RigEclipseCaseData.h"
#include "RigTofWellDistributionCalculator.h"
@ -28,14 +28,14 @@
#include "RiuQwtPlotWidget.h"
#include "qwt_plot.h"
#include "qwt_legend.h"
#include "qwt_legend_label.h"
#include "qwt_plot.h"
#include "qwt_plot_curve.h"
#include <QWidget>
#include <QGridLayout>
#include <QTextBrowser>
#include <QWidget>
//#include "cvfBase.h"
//#include "cvfTrace.h"
@ -43,7 +43,6 @@
#include <array>
//==================================================================================================
//
//
@ -66,7 +65,13 @@ RimWellDistributionPlot::RimWellDistributionPlot(RiaDefines::PhaseType phase)
CAF_PDM_InitField( &m_wellName, "WellName", QString( "None" ), "Well", "", "", "" );
CAF_PDM_InitField( &m_phase, "Phase", caf::AppEnum<RiaDefines::PhaseType>( phase ), "Phase", "", "", "" );
CAF_PDM_InitField( &m_groupSmallContributions, "GroupSmallContributions", true, "Group Small Contributions", "", "", "" );
CAF_PDM_InitField(&m_smallContributionsRelativeThreshold, "SmallContributionsRelativeThreshold", 0.005, "Relative Threshold [0, 1]", "", "", "");
CAF_PDM_InitField( &m_smallContributionsRelativeThreshold,
"SmallContributionsRelativeThreshold",
0.005,
"Relative Threshold [0, 1]",
"",
"",
"" );
m_showWindow = false;
m_showPlotLegends = true;
@ -75,14 +80,14 @@ RimWellDistributionPlot::RimWellDistributionPlot(RiaDefines::PhaseType phase)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellDistributionPlot::~RimWellDistributionPlot()
{
}
RimWellDistributionPlot::~RimWellDistributionPlot() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellDistributionPlot::setDataSourceParameters(RimEclipseResultCase* eclipseResultCase, int timeStepIndex, QString targetWellName)
void RimWellDistributionPlot::setDataSourceParameters( RimEclipseResultCase* eclipseResultCase,
int timeStepIndex,
QString targetWellName )
{
m_case = eclipseResultCase;
m_timeStepIndex = timeStepIndex;
@ -348,18 +353,23 @@ void RimWellDistributionPlot::onLoadDataAndUpdate()
const RimFlowDiagSolution* flowDiagSolution = m_case->defaultFlowDiagSolution();
//cvf::Trace::show("Populating plot for phase '%s'", m_phase == RiaDefines::OIL_PHASE ? "oil" : (m_phase == RiaDefines::GAS_PHASE ? "gas" : "water"));
// cvf::Trace::show("Populating plot for phase '%s'", m_phase == RiaDefines::OIL_PHASE ? "oil" : (m_phase ==
// RiaDefines::GAS_PHASE ? "gas" : "water"));
populatePlotWidgetWithCurveData( calc, *flowDiagSolution, m_plotWidget );
}
QString phaseString = "N/A";
if (m_phase == RiaDefines::OIL_PHASE) phaseString = "Oil";
else if (m_phase == RiaDefines::GAS_PHASE) phaseString = "Gas";
else if (m_phase == RiaDefines::WATER_PHASE) phaseString = "Water";
if ( m_phase == RiaDefines::OIL_PHASE )
phaseString = "Oil";
else if ( m_phase == RiaDefines::GAS_PHASE )
phaseString = "Gas";
else if ( m_phase == RiaDefines::WATER_PHASE )
phaseString = "Water";
const QString timeStepName = m_case ? m_case->timeStepName( m_timeStepIndex ) : "N/A";
const QString plotTitleStr = QString("%1 Distribution: %2, %3").arg(phaseString).arg(m_wellName).arg(timeStepName);
const QString plotTitleStr =
QString( "%1 Distribution: %2, %3" ).arg( phaseString ).arg( m_wellName ).arg( timeStepName );
m_plotWidget->setTitle( plotTitleStr );
m_plotWidget->setAxisTitleText( QwtPlot::xBottom, "TOF [years]" );
@ -373,7 +383,9 @@ void RimWellDistributionPlot::onLoadDataAndUpdate()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellDistributionPlot::populatePlotWidgetWithCurveData(const RigTofWellDistributionCalculator& calculator, const RimFlowDiagSolution& flowDiagSolution, RiuQwtPlotWidget* plotWidget)
void RimWellDistributionPlot::populatePlotWidgetWithCurveData( const RigTofWellDistributionCalculator& calculator,
const RimFlowDiagSolution& flowDiagSolution,
RiuQwtPlotWidget* plotWidget )
{
// cvf::Trace::show("RimWellDistributionPlot::populatePlotWidgetWithCurves()");
@ -400,7 +412,8 @@ void RimWellDistributionPlot::populatePlotWidgetWithCurveData(const RigTofWellDi
tofValuesYears.push_back( tofYears );
}
//cvf::Trace::show("numTofValues: %d (min, max: %f, %f)", static_cast<int>(tofValuesYears.size()), tofValuesYears.front(), tofValuesYears.back());
// cvf::Trace::show("numTofValues: %d (min, max: %f, %f)", static_cast<int>(tofValuesYears.size()),
// tofValuesYears.front(), tofValuesYears.back());
const size_t numWells = calculator.contributingWellCount();
// cvf::Trace::show("numContribWells: %d", static_cast<int>(numWells));
@ -420,7 +433,8 @@ void RimWellDistributionPlot::populatePlotWidgetWithCurveData(const RigTofWellDi
yVals[j] += volArr[j];
}
//cvf::Trace::show("wellName min, max: %15s %12.3f, %12.3f maxAggrY: %12.3f", wellName.toStdString().c_str(), volArr.front(), volArr.back(), yVals.back());
// cvf::Trace::show("wellName min, max: %15s %12.3f, %12.3f maxAggrY: %12.3f",
// wellName.toStdString().c_str(), volArr.front(), volArr.back(), yVals.back());
QwtPlotCurve* curve = new QwtPlotCurve;
curve->setTitle( wellName );
@ -452,7 +466,8 @@ void RimWellDistributionPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiO
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimWellDistributionPlot::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
QList<caf::PdmOptionItemInfo>
RimWellDistributionPlot::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options = RimPlot::calculateValueOptions( fieldNeedingOptions, useOptionsOnly );
@ -512,7 +527,9 @@ QList<caf::PdmOptionItemInfo> RimWellDistributionPlot::calculateValueOptions(con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellDistributionPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimWellDistributionPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
RimPlot::fieldChangedByUi( changedField, oldValue, newValue );
@ -550,5 +567,3 @@ void RimWellDistributionPlot::fixupDependentFieldsAfterCaseChange()
m_timeStepIndex = newTimeStepIndex;
m_wellName = newWellName;
}

15
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlot.h
View File

@ -18,8 +18,8 @@
#pragma once
#include "RimPlot.h"
#include "RiaDefines.h"
#include "RimPlot.h"
#include "cafPdmPtrField.h"
@ -30,8 +30,6 @@ class RimFlowDiagSolution;
class RigTofWellDistributionCalculator;
class RiuQwtPlotWidget;
//==================================================================================================
//
//
@ -81,11 +79,16 @@ private:
private:
void fixupDependentFieldsAfterCaseChange();
static void populatePlotWidgetWithCurveData(const RigTofWellDistributionCalculator& calculator, const RimFlowDiagSolution& flowDiagSolution, RiuQwtPlotWidget* plotWidget);
static void populatePlotWidgetWithCurveData( const RigTofWellDistributionCalculator& calculator,
const RimFlowDiagSolution& flowDiagSolution,
RiuQwtPlotWidget* plotWidget );
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
private:
caf::PdmPtrField<RimEclipseResultCase*> m_case;

41
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp
View File

@ -18,8 +18,8 @@
#include "RimWellDistributionPlotCollection.h"
#include "RimEclipseResultCase.h"
#include "RimProject.h"
#include "RimFlowDiagSolution.h"
#include "RimProject.h"
#include "RimWellDistributionPlot.h"
#include "RigEclipseCaseData.h"
@ -29,19 +29,18 @@
#include "RiuQwtPlotTools.h"
#include "qwt_plot.h"
#include "qwt_legend.h"
#include "qwt_plot.h"
#include "qwt_plot_curve.h"
#include <QWidget>
#include <QGridLayout>
#include <QTextBrowser>
#include <QWidget>
//#include "cvfBase.h"
//#include "cvfTrace.h"
//#include "cvfDebugTimer.h"
//==================================================================================================
//
//
@ -64,7 +63,13 @@ RimWellDistributionPlotCollection::RimWellDistributionPlotCollection()
CAF_PDM_InitField( &m_timeStepIndex, "TimeStepIndex", -1, "Time Step", "", "", "" );
CAF_PDM_InitField( &m_wellName, "WellName", QString( "None" ), "Well", "", "", "" );
CAF_PDM_InitField( &m_groupSmallContributions, "GroupSmallContributions", true, "Group Small Contributions", "", "", "" );
CAF_PDM_InitField(&m_smallContributionsRelativeThreshold, "SmallContributionsRelativeThreshold", 0.005, "Relative Threshold [0, 1]", "", "", "");
CAF_PDM_InitField( &m_smallContributionsRelativeThreshold,
"SmallContributionsRelativeThreshold",
0.005,
"Relative Threshold [0, 1]",
"",
"",
"" );
m_plotWindowTitle = "Well Distribution Plots";
m_columnCountEnum = RimMultiPlotWindow::COLUMNS_UNLIMITED;
@ -83,9 +88,7 @@ RimWellDistributionPlotCollection::RimWellDistributionPlotCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellDistributionPlotCollection::~RimWellDistributionPlotCollection()
{
}
RimWellDistributionPlotCollection::~RimWellDistributionPlotCollection() {}
//--------------------------------------------------------------------------------------------------
///
@ -117,9 +120,12 @@ void RimWellDistributionPlotCollection::defineUiOrdering(QString uiConfigName, c
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimWellDistributionPlotCollection::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
QList<caf::PdmOptionItemInfo>
RimWellDistributionPlotCollection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options = RimMultiPlotWindow::calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
QList<caf::PdmOptionItemInfo> options = RimMultiPlotWindow::calculateValueOptions( fieldNeedingOptions,
useOptionsOnly );
if ( fieldNeedingOptions == &m_case )
{
@ -177,7 +183,9 @@ QList<caf::PdmOptionItemInfo> RimWellDistributionPlotCollection::calculateValueO
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellDistributionPlotCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimWellDistributionPlotCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
if ( changedField == &m_case )
{
@ -185,11 +193,8 @@ void RimWellDistributionPlotCollection::fieldChangedByUi(const caf::PdmFieldHand
}
bool shouldRecalculatePlotData = false;
if (changedField == &m_case ||
changedField == &m_timeStepIndex ||
changedField == &m_wellName ||
changedField == &m_groupSmallContributions ||
changedField == &m_smallContributionsRelativeThreshold)
if ( changedField == &m_case || changedField == &m_timeStepIndex || changedField == &m_wellName ||
changedField == &m_groupSmallContributions || changedField == &m_smallContributionsRelativeThreshold )
{
applyPlotParametersToContainedPlots();
shouldRecalculatePlotData = true;
@ -203,7 +208,6 @@ void RimWellDistributionPlotCollection::fieldChangedByUi(const caf::PdmFieldHand
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -220,7 +224,6 @@ void RimWellDistributionPlotCollection::applyPlotParametersToContainedPlots()
aPlot->setPlotOptions( m_groupSmallContributions, m_smallContributionsRelativeThreshold );
}
}
}
//--------------------------------------------------------------------------------------------------
@ -249,5 +252,3 @@ void RimWellDistributionPlotCollection::fixupDependentFieldsAfterCaseChange()
m_timeStepIndex = newTimeStepIndex;
m_wellName = newWellName;
}

10
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.h
View File

@ -18,8 +18,8 @@
#pragma once
#include "RimMultiPlotWindow.h"
#include "RiaDefines.h"
#include "RimMultiPlotWindow.h"
#include "cafPdmPtrField.h"
@ -34,7 +34,6 @@ class RigTofWellDistributionCalculator;
class QTextBrowser;
class QwtPlot;
//==================================================================================================
//
//
@ -50,8 +49,11 @@ public:
private:
// RimPlotWindow overrides
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
virtual void onLoadDataAndUpdate() override;

73
ApplicationCode/ReservoirDataModel/RigTofWellDistributionCalculator.cpp
View File

@ -19,8 +19,8 @@
#include "RigTofWellDistributionCalculator.h"
#include "RiaDefines.h"
#include "RiaPorosityModel.h"
#include "RiaLogging.h"
#include "RiaPorosityModel.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
@ -35,8 +35,6 @@
#include <map>
//==================================================================================================
//
//
@ -46,7 +44,10 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigTofWellDistributionCalculator::RigTofWellDistributionCalculator(RimEclipseResultCase* caseToApply, QString targetWellname, size_t timeStepIndex, RiaDefines::PhaseType phase)
RigTofWellDistributionCalculator::RigTofWellDistributionCalculator( RimEclipseResultCase* caseToApply,
QString targetWellname,
size_t timeStepIndex,
RiaDefines::PhaseType phase )
{
CVF_ASSERT( caseToApply );
@ -59,24 +60,37 @@ RigTofWellDistributionCalculator::RigTofWellDistributionCalculator(RimEclipseRes
RigFlowDiagResults* flowDiagResults = flowDiagSolution->flowDiagResults();
CVF_ASSERT( flowDiagResults );
const std::vector<double>* porvResults = eclipseCaseData->resultValues(RiaDefines::MATRIX_MODEL, RiaDefines::STATIC_NATIVE, "PORV", 0);
const std::vector<double>* porvResults = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
RiaDefines::STATIC_NATIVE,
"PORV",
0 );
if ( !porvResults )
{
return;
}
QString phaseResultName;
if (phase == RiaDefines::WATER_PHASE) phaseResultName = "SWAT";
else if (phase == RiaDefines::OIL_PHASE) phaseResultName = "SOIL";
else if (phase == RiaDefines::GAS_PHASE) phaseResultName = "SGAS";
const std::vector<double>* phaseResults = eclipseCaseData->resultValues(RiaDefines::MATRIX_MODEL, RiaDefines::DYNAMIC_NATIVE, phaseResultName, timeStepIndex);
if ( phase == RiaDefines::WATER_PHASE )
phaseResultName = "SWAT";
else if ( phase == RiaDefines::OIL_PHASE )
phaseResultName = "SOIL";
else if ( phase == RiaDefines::GAS_PHASE )
phaseResultName = "SGAS";
const std::vector<double>* phaseResults = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
RiaDefines::DYNAMIC_NATIVE,
phaseResultName,
timeStepIndex );
if ( !phaseResults )
{
return;
}
const RigFlowDiagResultAddress resultAddrTof("TOF", RigFlowDiagResultAddress::PhaseSelection::PHASE_ALL, targetWellname.toStdString());
const RigFlowDiagResultAddress resultAddrFraction("Fraction", RigFlowDiagResultAddress::PhaseSelection::PHASE_ALL, targetWellname.toStdString());
const RigFlowDiagResultAddress resultAddrTof( "TOF",
RigFlowDiagResultAddress::PhaseSelection::PHASE_ALL,
targetWellname.toStdString() );
const RigFlowDiagResultAddress resultAddrFraction( "Fraction",
RigFlowDiagResultAddress::PhaseSelection::PHASE_ALL,
targetWellname.toStdString() );
const std::vector<double>* tofData = flowDiagResults->resultValues( resultAddrTof, timeStepIndex );
const std::vector<double>* targetWellFractionData = flowDiagResults->resultValues( resultAddrFraction, timeStepIndex );
if ( !tofData || !targetWellFractionData )
@ -84,18 +98,22 @@ RigTofWellDistributionCalculator::RigTofWellDistributionCalculator(RimEclipseRes
return;
}
const std::map<double, std::vector<size_t>> tofToCellIndicesMap = buildSortedTofToCellIndicesMap( *tofData );
const std::vector<QString> candidateContributingWellNames = findCandidateContributingWellNames(*flowDiagSolution, targetWellname, timeStepIndex);
const std::vector<QString> candidateContributingWellNames = findCandidateContributingWellNames( *flowDiagSolution,
targetWellname,
timeStepIndex );
const size_t numContribWells = candidateContributingWellNames.size();
for ( size_t iContribWell = 0; iContribWell < numContribWells; iContribWell++ )
{
const QString contribWellName = candidateContributingWellNames[iContribWell];
const RigFlowDiagResultAddress resultAddrContribWellFraction("Fraction", RigFlowDiagResultAddress::PhaseSelection::PHASE_ALL, contribWellName.toStdString());
const std::vector<double>* contribWellFractionData = flowDiagResults->resultValues(resultAddrContribWellFraction, timeStepIndex);
const RigFlowDiagResultAddress resultAddrContribWellFraction( "Fraction",
RigFlowDiagResultAddress::PhaseSelection::PHASE_ALL,
contribWellName.toStdString() );
const std::vector<double>* contribWellFractionData = flowDiagResults->resultValues( resultAddrContribWellFraction,
timeStepIndex );
if ( !contribWellFractionData )
{
continue;
@ -190,7 +208,8 @@ void RigTofWellDistributionCalculator::groupSmallContributions(double smallContr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::map<double, std::vector<size_t>> RigTofWellDistributionCalculator::buildSortedTofToCellIndicesMap(const std::vector<double>& tofData)
std::map<double, std::vector<size_t>>
RigTofWellDistributionCalculator::buildSortedTofToCellIndicesMap( const std::vector<double>& tofData )
{
std::map<double, std::vector<size_t>> tofToCellIndicesMap;
@ -223,24 +242,30 @@ std::map<double, std::vector<size_t>> RigTofWellDistributionCalculator::buildSor
//--------------------------------------------------------------------------------------------------
/// Determine name of the the wells that are candidates for contributing in our calculation
//--------------------------------------------------------------------------------------------------
std::vector<QString> RigTofWellDistributionCalculator::findCandidateContributingWellNames(const RimFlowDiagSolution& flowDiagSolution, QString targetWellname, size_t timeStepIndex)
std::vector<QString>
RigTofWellDistributionCalculator::findCandidateContributingWellNames( const RimFlowDiagSolution& flowDiagSolution,
QString targetWellname,
size_t timeStepIndex )
{
std::vector<QString> candidateWellNames;
const RimFlowDiagSolution::TracerStatusType targetWellStatus = flowDiagSolution.tracerStatusInTimeStep(targetWellname, timeStepIndex);
if (targetWellStatus != RimFlowDiagSolution::INJECTOR &&
targetWellStatus != RimFlowDiagSolution::PRODUCER)
const RimFlowDiagSolution::TracerStatusType targetWellStatus =
flowDiagSolution.tracerStatusInTimeStep( targetWellname, timeStepIndex );
if ( targetWellStatus != RimFlowDiagSolution::INJECTOR && targetWellStatus != RimFlowDiagSolution::PRODUCER )
{
RiaLogging::warning( "Status of target well is neither INJECTOR nor PRODUCER" );
return candidateWellNames;
}
const RimFlowDiagSolution::TracerStatusType oppositeStatus = (targetWellStatus == RimFlowDiagSolution::INJECTOR) ? RimFlowDiagSolution::PRODUCER : RimFlowDiagSolution::INJECTOR;
const RimFlowDiagSolution::TracerStatusType oppositeStatus = ( targetWellStatus == RimFlowDiagSolution::INJECTOR )
? RimFlowDiagSolution::PRODUCER
: RimFlowDiagSolution::INJECTOR;
const std::vector<QString> allWellNames = flowDiagSolution.tracerNames();
for ( QString name : allWellNames )
{
const RimFlowDiagSolution::TracerStatusType status = flowDiagSolution.tracerStatusInTimeStep(name, timeStepIndex);
const RimFlowDiagSolution::TracerStatusType status = flowDiagSolution.tracerStatusInTimeStep( name,
timeStepIndex );
if ( status == oppositeStatus )
{
candidateWellNames.push_back( name );
@ -284,10 +309,10 @@ const QString& RigTofWellDistributionCalculator::contributingWellName(size_t con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigTofWellDistributionCalculator::accumulatedVolumeForContributingWell(size_t contributingWellIndex) const
const std::vector<double>&
RigTofWellDistributionCalculator::accumulatedVolumeForContributingWell( size_t contributingWellIndex ) const
{
CVF_ASSERT( contributingWellIndex < m_contributingWells.size() );
const ContribWellEntry& entry = m_contributingWells[contributingWellIndex];
return entry.accumulatedVolAlongTof;
}

13
ApplicationCode/ReservoirDataModel/RigTofWellDistributionCalculator.h
View File

@ -21,8 +21,8 @@
#include "RiaDefines.h"
#include <cstddef>
#include <vector>
#include <map>
#include <vector>
#include <QString>
@ -30,7 +30,6 @@ class RimEclipseResultCase;
class RimFlowDiagSolution;
class QString;
//==================================================================================================
//
//
@ -39,7 +38,10 @@ class QString;
class RigTofWellDistributionCalculator
{
public:
RigTofWellDistributionCalculator(RimEclipseResultCase* caseToApply, QString targetWellname, size_t timeStepIndex, RiaDefines::PhaseType phase);
RigTofWellDistributionCalculator( RimEclipseResultCase* caseToApply,
QString targetWellname,
size_t timeStepIndex,
RiaDefines::PhaseType phase );
void groupSmallContributions( double smallContribThreshold );
@ -51,7 +53,9 @@ public:
private:
static std::map<double, std::vector<size_t>> buildSortedTofToCellIndicesMap( const std::vector<double>& tofData );
static std::vector<QString> findCandidateContributingWellNames(const RimFlowDiagSolution& flowDiagSolution, QString targetWellname, size_t timeStepIndex);
static std::vector<QString> findCandidateContributingWellNames( const RimFlowDiagSolution& flowDiagSolution,
QString targetWellname,
size_t timeStepIndex );
struct ContribWellEntry
{
@ -63,4 +67,3 @@ private:
std::vector<double> m_tofInIncreasingOrder;
std::vector<ContribWellEntry> m_contributingWells;
};

3
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp
View File

@ -55,8 +55,6 @@ RiuRelativePermeabilityPlotUpdater::RiuRelativePermeabilityPlotUpdater( RiuRelat
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -288,7 +286,6 @@ RiuRelativePermeabilityPlotUpdater::extractEclipseSelectionItem( const RiuSelect
return eclipseSelectionItem;
}
//==================================================================================================
//
//