From fc8eefb5fedd94e9b77d4a014d14e61d56bb8c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rnar=20Grip=20Fj=C3=A6r?= Date: Thu, 3 Aug 2017 14:23:50 +0200 Subject: [PATCH] #1688 Make all commands using a [RequestedTimeSteps] handle a single timestep --- OctavePlugin/riGetActiveCellProperty.cpp | 2 +- OctavePlugin/riGetGridProperty.cpp | 2 +- OctavePlugin/riGetWellStatus.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OctavePlugin/riGetActiveCellProperty.cpp b/OctavePlugin/riGetActiveCellProperty.cpp index 573e324f12..7c2551aad4 100644 --- a/OctavePlugin/riGetActiveCellProperty.cpp +++ b/OctavePlugin/riGetActiveCellProperty.cpp @@ -148,7 +148,7 @@ DEFUN_DLD (riGetActiveCellProperty, args, nargout, // 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; for (size_t aIdx = 3; aIdx < argIndices.size(); ++aIdx) diff --git a/OctavePlugin/riGetGridProperty.cpp b/OctavePlugin/riGetGridProperty.cpp index 075c36ee48..7b5db5ed40 100644 --- a/OctavePlugin/riGetGridProperty.cpp +++ b/OctavePlugin/riGetGridProperty.cpp @@ -163,7 +163,7 @@ DEFUN_DLD (riGetGridProperty, args, nargout, // 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; for (size_t aIdx = 3; aIdx < argIndices.size(); ++aIdx) diff --git a/OctavePlugin/riGetWellStatus.cpp b/OctavePlugin/riGetWellStatus.cpp index 0e779dd108..6c10b23a70 100644 --- a/OctavePlugin/riGetWellStatus.cpp +++ b/OctavePlugin/riGetWellStatus.cpp @@ -136,7 +136,7 @@ DEFUN_DLD (riGetWellStatus, args, nargout, // Check if we have a Requested TimeSteps 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; }