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

Octave Server: Fix on getting active cellinfo

Browse Source 
p4#: 21318
This commit is contained in:
Jacob Støren 2013-04-16 12:08:45 +02:00
parent 9f07daefad
commit b38d4313d7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@ -57,7 +57,7 @@ RiaSocketServer::RiaSocketServer(QObject* parent)
{ {
m_errorMessageDialog->showMessage("Octave communication disabled :\n" m_errorMessageDialog->showMessage("Octave communication disabled :\n"
"\n" "\n"
"This instance of ResInsight could not start the Socket Server enabeling octave to get and set data.\n" "This instance of ResInsight could not start the Socket Server enabling octave to get and set data.\n"
"This is probably because you already have a running ResInsight process.\n" "This is probably because you already have a running ResInsight process.\n"
"Octave can only communicate with one ResInsight process at a time, so the Octave\n" "Octave can only communicate with one ResInsight process at a time, so the Octave\n"
"communication in this ResInsight instance will be disabled.\n" "communication in this ResInsight instance will be disabled.\n"
@ -367,7 +367,8 @@ void RiaSocketServer::readCommandFromOctave()
return; return;
} }
calculateMatrixModelActiveCellInfo(activeCellInfo[0], calculateMatrixModelActiveCellInfo(reservoir,
activeCellInfo[0],
activeCellInfo[1], activeCellInfo[1],
activeCellInfo[2], activeCellInfo[2],
activeCellInfo[3], activeCellInfo[3],
@ -618,7 +619,7 @@ void RiaSocketServer::slotReadyRead()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaSocketServer::calculateMatrixModelActiveCellInfo(std::vector<qint32>& gridNumber, std::vector<qint32>& cellI, std::vector<qint32>& cellJ, std::vector<qint32>& cellK, std::vector<qint32>& parentGridNumber, std::vector<qint32>& hostCellI, std::vector<qint32>& hostCellJ, std::vector<qint32>& hostCellK) void RiaSocketServer::calculateMatrixModelActiveCellInfo(RimCase* reservoirCase, std::vector<qint32>& gridNumber, std::vector<qint32>& cellI, std::vector<qint32>& cellJ, std::vector<qint32>& cellK, std::vector<qint32>& parentGridNumber, std::vector<qint32>& hostCellI, std::vector<qint32>& hostCellJ, std::vector<qint32>& hostCellK)
{ {
gridNumber.clear(); gridNumber.clear();
cellI.clear(); cellI.clear();
@ -629,12 +630,12 @@ void RiaSocketServer::calculateMatrixModelActiveCellInfo(std::vector<qint32>& gr
hostCellJ.clear(); hostCellJ.clear();
hostCellK.clear(); hostCellK.clear();
if (!m_currentReservoir || !m_currentReservoir->reservoirData() || !m_currentReservoir->reservoirData()->mainGrid()) if (!reservoirCase || !reservoirCase->reservoirData() || !reservoirCase->reservoirData()->mainGrid())
{ {
return; return;
} }
RigActiveCellInfo* actCellInfo = m_currentReservoir->reservoirData()->activeCellInfo(RifReaderInterface::MATRIX_RESULTS); RigActiveCellInfo* actCellInfo = reservoirCase->reservoirData()->activeCellInfo(RifReaderInterface::MATRIX_RESULTS);
size_t numMatrixModelActiveCells = actCellInfo->globalActiveCellCount(); size_t numMatrixModelActiveCells = actCellInfo->globalActiveCellCount();
gridNumber.reserve(numMatrixModelActiveCells); gridNumber.reserve(numMatrixModelActiveCells);
@ -646,7 +647,7 @@ void RiaSocketServer::calculateMatrixModelActiveCellInfo(std::vector<qint32>& gr
hostCellJ.reserve(numMatrixModelActiveCells); hostCellJ.reserve(numMatrixModelActiveCells);
hostCellK.reserve(numMatrixModelActiveCells); hostCellK.reserve(numMatrixModelActiveCells);
const std::vector<RigCell>& globalCells = m_currentReservoir->reservoirData()->mainGrid()->cells(); const std::vector<RigCell>& globalCells = reservoirCase->reservoirData()->mainGrid()->cells();
for (size_t cIdx = 0; cIdx < globalCells.size(); ++cIdx) for (size_t cIdx = 0; cIdx < globalCells.size(); ++cIdx)
{ {

3
ApplicationCode/SocketInterface/RiaSocketServer.h
View File

@ -56,7 +56,8 @@ private:
RimCase* findReservoir(const QString &casename); RimCase* findReservoir(const QString &casename);
void terminateCurrentConnection(); void terminateCurrentConnection();
void calculateMatrixModelActiveCellInfo(std::vector<qint32>& gridNumber, void calculateMatrixModelActiveCellInfo(RimCase* reservoirCase,
std::vector<qint32>& gridNumber,
std::vector<qint32>& cellI, std::vector<qint32>& cellI,
std::vector<qint32>& cellJ, std::vector<qint32>& cellJ,
std::vector<qint32>& cellK, std::vector<qint32>& cellK,