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

#1268 Well Alloc Plots: Fixed missing grouping of small contributions for pseudo depth

Browse Source
This commit is contained in:
Jacob Støren
2017-03-01 15:54:46 +01:00
parent 68ff093c61
commit 984762ab5d
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp
View File

@@ -634,8 +634,14 @@ void RigAccWellFlowCalculator::groupSmallContributions()
for ( BranchFlow& brRes : m_connectionFlowPrBranch )
{
groupSmallTracers( brRes.accFlowPrTracer, tracersToGroup);
groupSmallTracers( brRes.flowPrTracer, tracersToGroup);
groupSmallTracers( &brRes.accFlowPrTracer, tracersToGroup);
groupSmallTracers( &brRes.flowPrTracer, tracersToGroup);
}
for ( BranchFlow& brRes : m_pseudoLengthFlowPrBranch )
{
groupSmallTracers( &brRes.accFlowPrTracer, tracersToGroup);
groupSmallTracers( &brRes.flowPrTracer, tracersToGroup);
}
// Remove the grouped tracer names from the tracerName list, and replace with the "Others" name
@@ -660,18 +666,18 @@ void RigAccWellFlowCalculator::groupSmallContributions()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigAccWellFlowCalculator::groupSmallTracers(std::map<QString, std::vector<double>> &branchFlowSet, std::vector<QString> tracersToGroup)
void RigAccWellFlowCalculator::groupSmallTracers(std::map<QString, std::vector<double> >* branchFlowSet, const std::vector<QString>& tracersToGroup)
{
if ( branchFlowSet.empty() ) return;
if ( branchFlowSet->empty() ) return;
size_t depthCount = branchFlowSet.begin()->second.size();
size_t depthCount = branchFlowSet->begin()->second.size();
std::vector<double> groupedAccFlowValues(depthCount, 0.0);
for ( const QString& tracername:tracersToGroup )
{
auto it = branchFlowSet.find(tracername);
auto it = branchFlowSet->find(tracername);
if ( it != branchFlowSet.end() )
if ( it != branchFlowSet->end() )
{
const std::vector<double>& tracerVals = it->second;
for ( size_t cIdx = 0; cIdx < groupedAccFlowValues.size(); ++cIdx )
@@ -680,9 +686,9 @@ void RigAccWellFlowCalculator::groupSmallTracers(std::map<QString, std::vector<d
}
}
branchFlowSet.erase(it);
branchFlowSet->erase(it);
}
branchFlowSet[RIG_TINY_TRACER_GROUP_NAME] = groupedAccFlowValues;
(*branchFlowSet)[RIG_TINY_TRACER_GROUP_NAME] = groupedAccFlowValues;
}

4
ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.h
View File

@@ -98,8 +98,8 @@ private:
void sortTracers();
void groupSmallContributions();
void groupSmallTracers(std::map<QString, std::vector<double>> &branchFlowSet,
std::vector<QString> tracersToGroup);
void groupSmallTracers(std::map<QString, std::vector<double> >* branchFlowSet,
const std::vector<QString>& tracersToGroup);
bool isWellFlowConsistent(bool isProducer) const;
std::vector<size_t> wrpToConnectionIndexFromBottom( const std::vector<RigWellResultPoint> &branchCells) const;