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

Refactor classes in RigWellResultPoint.h

Browse Source 
* Move RigWellResultFrame implementation into separate file
Update/correct includes accordingly

* First step of moving attributes from public to private
- Move public members to private and create interface
- Single public member remains due to strong dependency on usage of reference and reference to its object public members

* Second step of moving attributes from public to privatee
- Remove usage of reference directly to attributes. Interface with copy and set.
- Moving attributes in RigWellResultFrame and RigWellResultBranch

* Move class RigWellResultBranch into separate file
This commit is contained in:
Jørgen Herje
2023-04-14 11:00:45 +02:00
committed by GitHub
parent dc4d4022d2
commit 457dc9080f
36 changed files with 653 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationLibCode/ReservoirDataModel/RigMswCenterLineCalculator.cpp
View File

@@ -25,6 +25,7 @@
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigSimWellData.h"
#include "RigWellResultFrame.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
@@ -80,8 +81,8 @@ std::vector<SimulationWellCellBranch>
wellFramePtr = wellResults->wellResultFrame( timeStepIndex );
}
const RigWellResultFrame& wellFrame = *wellFramePtr;
const std::vector<RigWellResultBranch>& resultBranches = wellFrame.m_wellResultBranches;
const RigWellResultFrame& wellFrame = *wellFramePtr;
const std::vector<RigWellResultBranch> resultBranches = wellFrame.wellResultBranches();
std::vector<WellBranch> wellBranches = mergeShortBranchesIntoLongBranches( resultBranches );
@@ -89,18 +90,18 @@ std::vector<SimulationWellCellBranch>
for ( const auto& resultBranch : resultBranches )
{
if ( resultBranch.m_branchResultPoints.empty() ) continue;
if ( resultBranch.branchResultPoints().empty() ) continue;
const auto firstResultPoint = resultBranch.m_branchResultPoints.front();
const RigWellResultPoint firstResultPoint = resultBranch.branchResultPoints().front();
for ( auto& wellBranch : wellBranches )
{
if ( wellBranch.m_branchId == resultBranch.m_ertBranchId )
if ( wellBranch.m_branchId == resultBranch.ertBranchId() )
{
if ( firstResultPoint.branchId() == resultBranch.m_ertBranchId )
if ( firstResultPoint.branchId() == resultBranch.ertBranchId() )
{
// The first result point is on the same branch, use well head as outlet
RigWellResultPoint outletResultPoint = wellFrame.m_wellHead;
RigWellResultPoint outletResultPoint = wellFrame.wellHead();
auto gridAndCellIndex = std::make_pair( outletResultPoint.gridIndex(), outletResultPoint.cellIndex() );
wellBranch.m_segmentsWithGridCells[outletResultPoint.segmentId()].push_back( gridAndCellIndex );
@@ -157,7 +158,7 @@ std::vector<SimulationWellCellBranch>
RigWellResultPoint resPoint;
for ( const auto& resBranch : resultBranches )
{
for ( const auto& respoint : resBranch.m_branchResultPoints )
for ( const auto& respoint : resBranch.branchResultPoints() )
{
if ( respoint.segmentId() == firstSegment )
{
@@ -301,9 +302,9 @@ std::vector<RigMswCenterLineCalculator::WellBranch>
for ( const auto& resultBranch : resBranches )
{
WellBranch branch;
branch.m_branchId = resultBranch.m_ertBranchId;
branch.m_branchId = resultBranch.ertBranchId();
for ( const auto& resPoint : resultBranch.m_branchResultPoints )
for ( const auto& resPoint : resultBranch.branchResultPoints() )
{
size_t gridIndex = resPoint.gridIndex();
size_t gridCellIndex = resPoint.cellIndex();
@@ -318,7 +319,7 @@ std::vector<RigMswCenterLineCalculator::WellBranch>
}
const int resultPointThreshold = 3;
if ( resultBranch.m_branchResultPoints.size() > resultPointThreshold )
if ( resultBranch.branchResultPoints().size() > resultPointThreshold )
{
longWellBranches.push_back( branch );
}