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: Fixed two issues with setGridProperty

Browse Source 
Missing argument check and wrong dimension check
p4#: 21828
This commit is contained in:
Jacob Støren 2013-06-04 16:10:39 +02:00
parent 1c02a392cd
commit f091629676
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OctavePlugin/riSetGridProperty.cpp
View File

@ -143,6 +143,15 @@ DEFUN_DLD (riSetGridProperty, args, nargout,
argIndices.push_back(4); // Time step indices argIndices.push_back(4); // Time step indices
argIndices.push_back(5); // Porosity model argIndices.push_back(5); // Porosity model
// Check that the second argument is an integer
if (!args(argIndices[1]).is_real_scalar()) // Check if second argument is an int. If it is
{
error("riSetGridProperty: The GridIndex argument is missing");
print_usage();
return octave_value_list ();
}
// Check if we do not have a CaseId: // Check if we do not have a CaseId:
if (args(argIndices[2]).is_string()) // Check if second argument is a text. If it is, the caseid is missing if (args(argIndices[2]).is_string()) // Check if second argument is a text. If it is, the caseid is missing
{ {
@ -193,7 +202,7 @@ DEFUN_DLD (riSetGridProperty, args, nargout,
if (timeStepIndices.length()) if (timeStepIndices.length())
{ {
int timeStepCount = mxDims.elem(1); int timeStepCount = mxDims.elem(3);
if (timeStepIndices.length() != timeStepCount) if (timeStepIndices.length() != timeStepCount)
{ {
error("riSetGridProperty: The number of time steps in the input matrix must match the number of time steps in the TimeStepIndices array."); error("riSetGridProperty: The number of time steps in the input matrix must match the number of time steps in the TimeStepIndices array.");