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

MswRollUp: Adding Branch start cell to start of branch

Browse Source 
This is an intermediate commit and does not compile
p4#: 22217
This commit is contained in:
Jacob Støren 2013-08-26 14:16:07 +02:00
parent e6dce28fa3
commit 544d98b37e
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -715,13 +715,13 @@ struct SegmentData
SegmentData(const well_conn_collection_type* connections) : SegmentData(const well_conn_collection_type* connections) :
m_branchId(-1), m_branchId(-1),
m_segmentId(-1), m_segmentId(-1),
m_gridIndex(cvf::UNDEFINED_SIZE_T), //m_gridIndex(cvf::UNDEFINED_SIZE_T),
m_connections(connections) m_connections(connections)
{} {}
int m_branchId; int m_branchId;
int m_segmentId; int m_segmentId;
size_t m_gridIndex; //size_t m_gridIndex;
const well_conn_collection_type* m_connections; const well_conn_collection_type* m_connections;
}; };
@ -895,7 +895,7 @@ void RifReaderEclipseOutput::readWellCells(const ecl_grid_type* mainEclGrid)
// Fill the SegmentData list with the segments from ert in branch sorted order: // Fill the SegmentData list with the segments from ert in branch sorted order:
// BrancN<TopSegment...BottomSegment>, ..., Branch0<TopSegment...BottomSegment> // Grid0(BrancN<TopSegment...BottomSegment>, ..., Branch0<TopSegment...BottomSegment>) ... GridN(BrancN<TopSegment...BottomSegment>, ..., Branch0<TopSegment...BottomSegment>)
std::list<SegmentData> segmentList; std::list<SegmentData> segmentList;
std::vector<const well_segment_type*> outletBranchSegmentList; // Keep a list of branch outlet segments to avoid traversal twice std::vector<const well_segment_type*> outletBranchSegmentList; // Keep a list of branch outlet segments to avoid traversal twice
@ -916,7 +916,7 @@ void RifReaderEclipseOutput::readWellCells(const ecl_grid_type* mainEclGrid)
SegmentData segmentData(NULL); SegmentData segmentData(NULL);
segmentData.m_branchId = branchId; segmentData.m_branchId = branchId;
segmentData.m_segmentId = well_segment_get_id(segment); segmentData.m_segmentId = well_segment_get_id(segment);
segmentData.m_gridIndex = gridNr; //segmentData.m_gridIndex = gridNr;
if (well_segment_has_grid_connections(segment, gridName.data())) if (well_segment_has_grid_connections(segment, gridName.data()))
{ {
@ -1111,8 +1111,22 @@ void RifReaderEclipseOutput::readWellCells(const ecl_grid_type* mainEclGrid)
} }
} }
} }
} }
// Try to add a copy of the outlet wellResultPoint into the start of each branch
size_t bCount = wellResFrame.m_wellResultBranches.size();
for (size_t bIdx = 0; bIdx < bCount; ++bIdx)
{
size_t outBranchIdx = wellResFrame.m_wellResultBranches[bIdx].m_outletBranchIndex_OBSOLETE;
size_t outCellIdx = wellResFrame.m_wellResultBranches[bIdx].m_outletBranchHeadCellIndex_OBSOLETE;
const RigWellResultPoint* resPoint = wellResFrame.findResultCellFromOutletSpecification(outBranchIdx, outCellIdx);
wellResFrame.m_wellResultBranches[bIdx].m_branchResultPoints.insert(wellResFrame.m_wellResultBranches[bIdx].m_branchResultPoints.begin(), *resPoint);
}
} }
else else
{ {