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

Reorganized data so ijk are the first three indexes in the receiving Octave arrays.

Browse Source 
Fixed a typo
p4#: 21708
This commit is contained in:
Magne Sjaastad
2013-05-24 08:48:36 +02:00
parent f556171bec
commit e5b1921bdf
13 changed files with 186 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OctavePlugin/riGetCellCenters.cpp
View File

@@ -37,13 +37,11 @@ void getCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16
{
if (!socket.waitForReadyRead(timeout))
{
error((("Wating for header: ") + socket.errorString()).toLatin1().data());
error((("Waiting for header: ") + socket.errorString()).toLatin1().data());
return;
}
}
// Read timestep count and blocksize
quint64 cellCountI;
quint64 cellCountJ;
quint64 cellCountK;
@@ -56,25 +54,20 @@ void getCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16
socketStream >> cellCountK;
socketStream >> byteCount;
// Create a 4D matrix, with the a column with the tree double value coords running as fastest index, then I, J, K
// Octave script to access coords
// coords = riGetCellCenters
// coords(:,i, j, k) # Will return the coords for given ijk location
dim_vector dv;
dv.resize(4);
dv(0) = 3;
dv(1) = cellCountI;
dv(2) = cellCountJ;
dv(3) = cellCountK;
cellCenterValues.resize(dv);
if (!(byteCount && cellCount))
{
error ("Could not find the requested data in ResInsight");
return;
}
// Wait for available data for each column, then read data for each column
dim_vector dv;
dv.resize(4);
dv(0) = cellCountI;
dv(1) = cellCountJ;
dv(2) = cellCountK;
dv(3) = 3;
cellCenterValues.resize(dv);
while (socket.bytesAvailable() < (qint64)(byteCount))
{
if (!socket.waitForReadyRead(timeout))
@@ -85,14 +78,13 @@ void getCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16
OCTAVE_QUIT;
}
octave_idx_type valueCount = cellCenterValues.length();
octave_stdout << " riGetCellCenters : I = " << cellCountI <<" J = " << cellCountJ << " K = " << cellCountK << std::endl;
octave_stdout << " riGetCellCenters : numDoubles = " << valueCount << std::endl;
//octave_stdout << " riGetCellCenters : I = " << cellCountI <<" J = " << cellCountJ << " K = " << cellCountK << std::endl;
//octave_stdout << " riGetCellCenters : numDoubles = " << valueCount << std::endl;
double* internalMatrixData = cellCenterValues.fortran_vec();
#if 0
octave_idx_type valueCount = cellCenterValues.length();
double val;
for (octave_idx_type i = 0; i < valueCount; i++)
{