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 use of buffer read

Browse Source
This commit is contained in:
Magne Sjaastad 2014-04-03 11:09:42 +02:00
parent d751128fde
commit 0fc0b62f7d
1 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
OctavePlugin/riGetActiveCellInfo.cpp
View File

@ -1,7 +1,10 @@
#include <QtNetwork> #include <QtNetwork>
#include <QStringList>
#include <octave/oct.h> #include <octave/oct.h>
#include "riSettings.h" #include "riSettings.h"
#include "riSocketTools.h"
void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, quint16 port, const qint64& caseId, const QString& porosityModel) void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, quint16 port, const qint64& caseId, const QString& porosityModel)
@ -43,59 +46,32 @@ void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, qu
// Read timestep count and blocksize // Read timestep count and blocksize
quint64 columnCount; quint64 columnCount;
quint64 byteCount; quint64 byteCountForOneTimestep;
size_t activeCellCount; size_t activeCellCount;
socketStream >> columnCount; socketStream >> columnCount;
socketStream >> byteCount; socketStream >> byteCountForOneTimestep;
activeCellCount = byteCount / sizeof(qint32); activeCellCount = byteCountForOneTimestep / sizeof(qint32);
dim_vector dv (2, 1); dim_vector dv (2, 1);
dv(0) = activeCellCount; dv(0) = activeCellCount;
dv(1) = columnCount; dv(1) = columnCount;
activeCellInfo.resize(dv); activeCellInfo.resize(dv);
if (!(byteCount && columnCount)) if (!(byteCountForOneTimestep && columnCount))
{ {
error ("Could not find the requested data in ResInsight"); error ("Could not find the requested data in ResInsight");
return; return;
} }
// Wait for available data for each column, then read data for each column qint32* internalMatrixData = (qint32*)activeCellInfo.fortran_vec()->mex_get_data();
for (size_t tIdx = 0; tIdx < columnCount; ++tIdx) QStringList errorMessages;
if (!readBlockData(socket, (char*)(internalMatrixData), columnCount * byteCountForOneTimestep, errorMessages))
{ {
while (socket.bytesAvailable() < (int)byteCount) for (int i = 0; i < errorMessages.size(); i++)
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) error(errorMessages[i].toLatin1().data());
{
QString errorMsg = QString("Waiting for column number: %1 of %2: %3").arg(tIdx).arg(columnCount).arg(socket.errorString());
error(errorMsg.toLatin1().data());
octave_stdout << "Active cells: " << activeCellCount << ", Columns: " << columnCount << std::endl;
return ;
}
OCTAVE_QUIT;
}
qint64 bytesRead = 0;
qint32* internalMatrixData = (qint32*)activeCellInfo.fortran_vec()->mex_get_data();
#if 1 // Use raw data transfer. Faster.
bytesRead = socket.read((char*)(internalMatrixData + tIdx * activeCellCount), byteCount);
#else
for (size_t cIdx = 0; cIdx < activeCellCount; ++cIdx)
{
socketStream >> internalMatrixData[tIdx * activeCellCount + cIdx];
if (socketStream.status() == QDataStream::Ok) bytesRead += sizeof(int);
}
#endif
if ((int)byteCount != bytesRead)
{
error("Could not read binary double data properly from socket");
octave_stdout << "Active cells: " << activeCellCount << ", Columns: " << columnCount << std::endl;
} }
OCTAVE_QUIT; OCTAVE_QUIT;