OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-01 03:37:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3930 Octave : Fix includes and replace deprecated functions

Browse Source
This commit is contained in:
Magne Sjaastad 2019-01-07 12:46:42 +01:00
parent c7e5373aaa
commit 2213bab996
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OctavePlugin/riGetActiveCellProperty.cpp
View File

@ -27,11 +27,11 @@ void getActiveCellProperty(Matrix& propertyFrames, const QString &serverName, qu
QString command;
command += "GetActiveCellProperty " + QString::number(caseId) + " " + propertyName + " " + porosityModel;
for (int i = 0; i < requestedTimeSteps.length(); ++i)
for (int i = 0; i < requestedTimeSteps.numel(); ++i)
{
if (i == 0) command += " ";
command += QString::number(static_cast<int>(requestedTimeSteps.elem(i)) - 1); // To make the index 0-based
if (i != requestedTimeSteps.length() -1) command += " ";
if (i != requestedTimeSteps.numel() -1) command += " ";
}
QByteArray cmdBytes = command.toLatin1();

4
OctavePlugin/riGetDynamicNNCValues.cpp
View File

@ -26,11 +26,11 @@ void getDynamicNNCValues(Matrix& propertyFrames, const QString &serverName, quin
QString command;
command += "GetDynamicNNCValues " + QString::number(caseId) + " " + propertyName;
for (int i = 0; i < requestedTimeSteps.length(); ++i)
for (int i = 0; i < requestedTimeSteps.numel(); ++i)
{
if (i == 0) command += " ";
command += QString::number(static_cast<int>(requestedTimeSteps.elem(i)) - 1); // To make the index 0-based
if (i != requestedTimeSteps.length() -1) command += " ";
if (i != requestedTimeSteps.numel() -1) command += " ";
}
QByteArray cmdBytes = command.toLatin1();

4
OctavePlugin/riGetGridProperty.cpp
View File

@ -27,11 +27,11 @@ void getGridProperty(NDArray& propertyFrames, const QString &serverName, quint16
QString command;
command += "GetGridProperty " + QString::number(caseId) + " " + QString::number(gridIdx) + " " + propertyName + " " + porosityModel;
for (qint64 i = 0; i < requestedTimeSteps.length(); ++i)
for (qint64 i = 0; i < requestedTimeSteps.numel(); ++i)
{
if (i == 0) command += " ";
command += QString::number(static_cast<int>(requestedTimeSteps.elem(i)) - 1); // To make the index 0-based
if (i != requestedTimeSteps.length() -1) command += " ";
if (i != requestedTimeSteps.numel() -1) command += " ";
}
QByteArray cmdBytes = command.toLatin1();

4
OctavePlugin/riGetGridPropertyForSelectedCells.cpp
View File

@ -27,11 +27,11 @@ void getGridPropertyForSelectedCells(Matrix& propertyFrames, const QString &serv
QString command;
command += "GetGridPropertyForSelectedCells " + QString::number(caseId) + " " + propertyName + " " + porosityModel;
for (int i = 0; i < requestedTimeSteps.length(); ++i)
for (int i = 0; i < requestedTimeSteps.numel(); ++i)
{
if (i == 0) command += " ";
command += QString::number(static_cast<int>(requestedTimeSteps.elem(i)) - 1); // To make the index 0-based
if (i != requestedTimeSteps.length() - 1) command += " ";
if (i != requestedTimeSteps.numel() - 1) command += " ";
}
QByteArray cmdBytes = command.toLatin1();

4
OctavePlugin/riGetWellStatus.cpp
View File

@ -24,11 +24,11 @@ void getWellStatus(std::vector<QString>& wellTypes, std::vector<int>& wellStatus
QString command;
command += QString("GetWellStatus") + " " + QString::number(caseId) + " " + wellName;
for (int i = 0; i < requestedTimeSteps.length(); ++i)
for (int i = 0; i < requestedTimeSteps.numel(); ++i)
{
if (i == 0) command += " ";
command += QString::number(static_cast<int>(requestedTimeSteps.elem(i)) - 1); // To make the index 0-based
if (i != requestedTimeSteps.length() -1) command += " ";
if (i != requestedTimeSteps.numel() -1) command += " ";
}
QByteArray cmdBytes = command.toLatin1();

8
OctavePlugin/riSetActiveCellProperty.cpp
View File

@ -31,11 +31,11 @@ void setEclipseProperty(const Matrix& propertyFrames, const QString &hostName, q
QString command;
command += "SetActiveCellProperty " + QString::number(caseId) + " " + propertyName + " " + porosityModel;
for (int i = 0; i < requestedTimeSteps.length(); ++i)
for (int i = 0; i < requestedTimeSteps.numel(); ++i)
{
if (i == 0) command += " ";
command += QString::number(static_cast<int>(requestedTimeSteps.elem(i)) - 1); // To make the index 0-based
if (i != requestedTimeSteps.length() -1) command += " ";
if (i != requestedTimeSteps.numel() -1) command += " ";
}
QByteArray cmdBytes = command.toLatin1();
@ -205,11 +205,11 @@ DEFUN_DLD (riSetActiveCellProperty, args, nargout,
if (argIndices[3] >= 0) requestedTimeSteps = args(argIndices[3]).int32_array_value();
if (argIndices[4] >= 0) porosityModel = args(argIndices[4]).string_value();
if (requestedTimeSteps.length())
if (requestedTimeSteps.numel())
{
int timeStepCount = mxDims.elem(1);
if (requestedTimeSteps.length() != timeStepCount)
if (requestedTimeSteps.numel() != timeStepCount)
{
error("riSetActiveCellProperty: The number of timesteps in the input matrix must match the number of timesteps in the TimeStepIndices array.");
print_usage();

8
OctavePlugin/riSetGridProperty.cpp
View File

@ -30,11 +30,11 @@ void setEclipseProperty(const NDArray& propertyFrames, const QString &hostName,
QString command = QString("SetGridProperty %1 %2 %3 %4").arg(caseId).arg(gridIndex).arg(propertyName).arg(porosityModel);
for (int i = 0; i < timeStepIndices.length(); ++i)
for (int i = 0; i < timeStepIndices.numel(); ++i)
{
if (i == 0) command += " ";
command += QString::number(static_cast<int>(timeStepIndices.elem(i)) - 1); // To make the index 0-based
if (i != timeStepIndices.length() -1) command += " ";
if (i != timeStepIndices.numel() -1) command += " ";
}
QByteArray cmdBytes = command.toLatin1();
@ -237,7 +237,7 @@ DEFUN_DLD (riSetGridProperty, args, nargout,
if (argIndices[4] >= 0) timeStepIndices = args(argIndices[4]).int32_array_value();
if (argIndices[5] >= 0) porosityModel = args(argIndices[5]).string_value();
if (timeStepIndices.length() > 1)
if (timeStepIndices.numel() > 1)
{
if (mxDims.length() == 3)
{
@ -247,7 +247,7 @@ DEFUN_DLD (riSetGridProperty, args, nargout,
}
int timeStepCount = mxDims.elem(3);
if (timeStepIndices.length() != timeStepCount)
if (timeStepIndices.numel() != timeStepCount)
{
error("riSetGridProperty: The number of time steps in the input matrix must match the number of time steps in the TimeStepIndices array.");
print_usage();

8
OctavePlugin/riSetNNCProperty.cpp
View File

@ -31,11 +31,11 @@ void setNNCProperty(const Matrix& propertyFrames, const QString &hostName, quint
QString command;
command += "SetNNCProperty " + QString::number(caseId) + " " + propertyName;
for (int i = 0; i < requestedTimeSteps.length(); ++i)
for (int i = 0; i < requestedTimeSteps.numel(); ++i)
{
if (i == 0) command += " ";
command += QString::number(static_cast<int>(requestedTimeSteps.elem(i)) - 1); // To make the index 0-based
if (i != requestedTimeSteps.length() -1) command += " ";
if (i != requestedTimeSteps.numel() -1) command += " ";
}
QByteArray cmdBytes = command.toLatin1();
@ -182,11 +182,11 @@ DEFUN_DLD (riSetNNCProperty, args, nargout,
if (argIndices[2] >= 0) propertyName = args(argIndices[2]).char_matrix_value().row_as_string(0);
if (argIndices[3] >= 0) requestedTimeSteps = args(argIndices[3]).int32_array_value();
if (requestedTimeSteps.length())
if (requestedTimeSteps.numel())
{
int timeStepCount = mxDims.elem(1);
if (requestedTimeSteps.length() != timeStepCount)
if (requestedTimeSteps.numel() != timeStepCount)
{
error("riSetNNCProperty: The number of time steps in the input matrix must match the number of time steps in the TimeStepIndices array.");
print_usage();