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 Interface: GetActiveCellProperty: Made timestep indices 1-based. Renamed the GetActiveCellProperty command where it was not yet done

Browse Source 
p4#: 21690
This commit is contained in:
Jacob Støren 2013-05-22 09:26:12 +02:00
parent 90e61c254b
commit f0d315c55e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OctavePlugin/riGetActiveCellProperty.cpp
View File

@ -2,7 +2,7 @@
#include <octave/oct.h>
#include "riSettings.h"
void getEclipseProperty(Matrix& propertyFrames, const QString &serverName, quint16 serverPort,
void getActiveCellProperty(Matrix& propertyFrames, const QString &serverName, quint16 serverPort,
const qint64& caseId, QString propertyName, const int32NDArray& requestedTimeSteps, QString porosityModel)
{
const int Timeout = riOctavePlugin::timeOutMilliSecs;
@ -22,12 +22,12 @@ void getEclipseProperty(Matrix& propertyFrames, const QString &serverName, quint
// Create command as a string with arguments , and send it:
QString command;
command += "GetProperty " + QString::number(caseId) + " " + propertyName + " " + porosityModel;
command += "GetActiveCellProperty " + QString::number(caseId) + " " + propertyName + " " + porosityModel;
for (int i = 0; i < requestedTimeSteps.length(); ++i)
{
if (i == 0) command += " ";
command += QString::number(static_cast<int>(requestedTimeSteps.elem(i)));
command += QString::number(static_cast<int>(requestedTimeSteps.elem(i)) - 1); // To make the index 0-based
if (i != requestedTimeSteps.length() -1) command += " ";
}
@ -130,7 +130,7 @@ DEFUN_DLD (riGetActiveCellProperty, args, nargout,
"This function returns a two dimensional matrix: [ActiveCells][Num TimestepsRequested] containing the requested property data from the case with CaseId."
"If the case contains coarse-cells, the results are expanded onto the active cells."
"If the CaseId is not defined, ResInsight’s Current Case is used."
"The RequestedTimeSteps must contain a list of indices to the requested timesteps. If not defined, all the timesteps are returned."
"The RequestedTimeSteps must contain a list of 1-based indices to the requested timesteps. If not defined, all the timesteps are returned."
)
{
if (nargout < 1)
@ -215,7 +215,7 @@ DEFUN_DLD (riGetActiveCellProperty, args, nargout,
return octave_value_list ();
}
getEclipseProperty(propertyFrames, "127.0.0.1", 40001, caseId, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str());
getActiveCellProperty(propertyFrames, "127.0.0.1", 40001, caseId, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str());
return octave_value(propertyFrames);
}