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

riGetActiveCellProperty: Fix for input properties

Browse Source 
Only read values for active cells if we have result values for all cells
This commit is contained in:
Magne Sjaastad
2014-06-11 12:06:15 +02:00
parent a37b9f6ea2
commit 7faf950dc7
2 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@@ -153,30 +153,42 @@ public:
size_t globalCellCount = activeInfo->globalCellCount();
for (size_t tIdx = 0; tIdx < requestedTimesteps.size(); ++tIdx)
{
std::vector<double>& doubleValues = scalarResultFrames->at(requestedTimesteps[tIdx]);
for (size_t gcIdx = 0; gcIdx < globalCellCount; ++gcIdx)
{
size_t resultIdx = activeInfo->cellResultIndex(gcIdx);
if (resultIdx != cvf::UNDEFINED_SIZE_T)
if (resultIdx == cvf::UNDEFINED_SIZE_T) continue;
if (resultIdx < doubleValues.size())
{
if (resultIdx < scalarResultFrames->at(requestedTimesteps[tIdx]).size())
if (doubleValues.size() == activeInfo->globalCellCount())
{
values[valueIndex] = scalarResultFrames->at(requestedTimesteps[tIdx])[resultIdx];
// When reading data from input text files, result data is read for all grid cells
// Read out values from data vector using global cell index instead of active cell result index
// When data is written back to ResInsight using RiaSetActiveCellProperty, the resulting
// data vector will have activeCellCount data values, which is potentially smaller
// than total number of cells
values[valueIndex] = doubleValues[gcIdx];
}
else
{
values[valueIndex] = HUGE_VAL;
values[valueIndex] = doubleValues[resultIdx];
}
}
else
{
values[valueIndex] = HUGE_VAL;
}
valueIndex++;
if (valueIndex >= valueCount)
valueIndex++;
if (valueIndex >= valueCount)
{
if (!RiaSocketTools::writeBlockData(server, server->currentClient(), (const char *)values.data(), valueIndex * sizeof(double)))
{
if (!RiaSocketTools::writeBlockData(server, server->currentClient(), (const char *)values.data(), valueIndex * sizeof(double)))
{
return false;
}
valueIndex = 0;
return false;
}
valueIndex = 0;
}
}
}