OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-16 10:22:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor code adjustments

Browse Source
This commit is contained in:
Magne Sjaastad committed 2019-12-19 11:55:34 +01:00
1 parent 4ccbd274b8
commit 4d3113255e
6 files changed
+48 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.cpp
+2 -2
View File
@@ -132,7 +132,7 @@ void RigTofAccumulatedPhaseFractionsCalculator::sortTofAndCalculateAccPhaseFract
double fractionPorvPhaseSumSoil = 0.0;
double fractionPorvPhaseSumSgas = 0.0;
for ( auto element : tofAndIndexMap )
for ( const auto& element : tofAndIndexMap )
{
double tofValue = element.first;
for ( int index : element.second )
@@ -160,4 +160,4 @@ void RigTofAccumulatedPhaseFractionsCalculator::sortTofAndCalculateAccPhaseFract
accumulatedPhaseFractionSoil.push_back( fractionPorvPhaseSumSoil / fractionPorvSum );
accumulatedPhaseFractionSgas.push_back( fractionPorvPhaseSumSgas / fractionPorvSum );
}
}
}
ApplicationCode/ReservoirDataModel/RigTofWellDistributionCalculator.cpp
+7 -6
View File
@@ -91,7 +91,8 @@ RigTofWellDistributionCalculator::RigTofWellDistributionCalculator( RimEclipseRe
const RigFlowDiagResultAddress resultAddrFraction( "Fraction",
RigFlowDiagResultAddress::PhaseSelection::PHASE_ALL,
targetWellname.toStdString() );
const std::vector<double>* tofData = flowDiagResults->resultValues( resultAddrTof, timeStepIndex );
const std::vector<double>* tofData = flowDiagResults->resultValues( resultAddrTof, timeStepIndex );
const std::vector<double>* targetWellFractionData = flowDiagResults->resultValues( resultAddrFraction, timeStepIndex );
if ( !tofData || !targetWellFractionData )
{
@@ -103,8 +104,8 @@ RigTofWellDistributionCalculator::RigTofWellDistributionCalculator( RimEclipseRe
const std::vector<QString> candidateContributingWellNames = findCandidateContributingWellNames( *flowDiagSolution,
targetWellname,
timeStepIndex );
const size_t numContribWells = candidateContributingWellNames.size();
const size_t numContribWells = candidateContributingWellNames.size();
for ( size_t iContribWell = 0; iContribWell < numContribWells; iContribWell++ )
{
const QString contribWellName = candidateContributingWellNames[iContribWell];
@@ -124,7 +125,7 @@ RigTofWellDistributionCalculator::RigTofWellDistributionCalculator( RimEclipseRe
ContribWellEntry contribWellEntry;
contribWellEntry.name = contribWellName;
for ( auto mapElement : tofToCellIndicesMap )
for ( const auto& mapElement : tofToCellIndicesMap )
{
const double tofValue = mapElement.first;
const std::vector<size_t>& cellIndicesArr = mapElement.second;
@@ -152,7 +153,7 @@ RigTofWellDistributionCalculator::RigTofWellDistributionCalculator( RimEclipseRe
}
}
for ( auto mapElement : tofToCellIndicesMap )
for ( const auto& mapElement : tofToCellIndicesMap )
{
const double tofValue = mapElement.first;
m_tofInIncreasingOrder.push_back( tofValue );
@@ -262,7 +263,7 @@ std::vector<QString>
: RimFlowDiagSolution::INJECTOR;
const std::vector<QString> allWellNames = flowDiagSolution.tracerNames();
for ( QString name : allWellNames )
for ( const QString& name : allWellNames )
{
const RimFlowDiagSolution::TracerStatusType status = flowDiagSolution.tracerStatusInTimeStep( name,
timeStepIndex );
@@ -285,7 +286,7 @@ std::vector<QString>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigTofWellDistributionCalculator::sortedUniqueTOFValues() const
const std::vector<double>& RigTofWellDistributionCalculator::sortedUniqueTofValues() const
{
return m_tofInIncreasingOrder;
}
ApplicationCode/ReservoirDataModel/RigTofWellDistributionCalculator.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
void groupSmallContributions( double smallContribThreshold );
const std::vector<double>& sortedUniqueTOFValues() const;
const std::vector<double>& sortedUniqueTofValues() const;
size_t contributingWellCount() const;
const QString& contributingWellName( size_t contribWellIndex ) const;