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

Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT.

Browse Source
This commit is contained in:
Magne Sjaastad
2012-09-13 10:56:39 +02:00
parent 3f96c61c72
commit 748f061a55
102 changed files with 1124 additions and 1146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -582,10 +582,13 @@ void RifReaderEclipseOutput::readWellCells(RigReservoir* reservoir)
if (ert_wellhead)
{
wellResFrame.m_wellHead.m_gridIndex = gridNr;
int gridK = CVF_MAX(0, ert_wellhead->k); // Why this ?
wellResFrame.m_wellHead.m_gridCellIndex = grids[gridNr]->cellIndexFromIJK(ert_wellhead->i, ert_wellhead->j, gridK);
int gridK = CVF_MAX(0, well_conn_get_k(ert_wellhead)); // Why this ?
int gridI = well_conn_get_i( ert_wellhead );
int gridJ = well_conn_get_j( ert_wellhead );
wellResFrame.m_wellHead.m_gridCellIndex = grids[gridNr]->cellIndexFromIJK(gridI, gridJ, gridK);
}
int branchCount = well_state_iget_lgr_num_branches(ert_well_state, gridNr);
if (branchCount > 0)
{
@@ -611,10 +614,20 @@ void RifReaderEclipseOutput::readWellCells(RigReservoir* reservoir)
RigWellResultCell& data = wellSegment.m_wellCells[existingConnCount + connIdx];
data.m_gridIndex = gridNr;
data.m_gridCellIndex = grids[gridNr]->cellIndexFromIJK(ert_connection->i, ert_connection->j, ert_connection->k);
data.m_isOpen = ert_connection->open;
data.m_branchId = ert_connection->branch;
data.m_segmentId = ert_connection->segment;
{
int connI = well_conn_get_i( ert_connection );
int connJ = well_conn_get_j( ert_connection );
int connK = well_conn_get_k( ert_connection );
bool open = well_conn_open( ert_connection );
int branch = well_conn_get_branch( ert_connection );
int segment = well_conn_get_segment( ert_connection );
data.m_gridCellIndex = grids[gridNr]->cellIndexFromIJK(connI , connJ , connK);
data.m_isOpen = open;
data.m_branchId = branch;
data.m_segmentId = segment;
}
}
}
}