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

#1688 Make all commands using a [RequestedTimeSteps] handle a single timestep

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-08-03 14:23:50 +02:00
parent 3a97384dcd
commit fc8eefb5fe
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OctavePlugin/riGetActiveCellProperty.cpp
View File

@ -148,7 +148,7 @@ DEFUN_DLD (riGetActiveCellProperty, args, nargout,
// Check if we have a Requested TimeSteps // Check if we have a Requested TimeSteps
if (!(nargin > argIndices[2] && args(argIndices[2]).is_matrix_type() && !args(argIndices[2]).is_string())) if (!(nargin > argIndices[2] && (args(argIndices[2]).is_matrix_type() || args(argIndices[2]).is_numeric_type()) && !args(argIndices[2]).is_string()))
{ {
argIndices[2] = -1; argIndices[2] = -1;
for (size_t aIdx = 3; aIdx < argIndices.size(); ++aIdx) for (size_t aIdx = 3; aIdx < argIndices.size(); ++aIdx)

2
OctavePlugin/riGetGridProperty.cpp
View File

@ -163,7 +163,7 @@ DEFUN_DLD (riGetGridProperty, args, nargout,
// Check if we have a Requested TimeSteps // Check if we have a Requested TimeSteps
if (!(nargin > argIndices[3] && args(argIndices[3]).is_matrix_type() && !args(argIndices[3]).is_string())) if (!(nargin > argIndices[3] && (args(argIndices[3]).is_matrix_type() || args(argIndices[3]).is_numeric_type()) && !args(argIndices[3]).is_string()))
{ {
argIndices[3] = -1; argIndices[3] = -1;
for (size_t aIdx = 3; aIdx < argIndices.size(); ++aIdx) for (size_t aIdx = 3; aIdx < argIndices.size(); ++aIdx)

2
OctavePlugin/riGetWellStatus.cpp
View File

@ -136,7 +136,7 @@ DEFUN_DLD (riGetWellStatus, args, nargout,
// Check if we have a Requested TimeSteps // Check if we have a Requested TimeSteps
int lastArgumentIndex = argIndices[2] ; int lastArgumentIndex = argIndices[2] ;
if (!(nargin > argIndices[2] && args(argIndices[2]).is_matrix_type())) if (!(nargin > argIndices[2] && (args(argIndices[2]).is_matrix_type() || args(argIndices[2]).is_numeric_type())))
{ {
argIndices[2] = -1; argIndices[2] = -1;
} }