From 05ae73551965a942f3f3e0015d77da0d0885a838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Fri, 4 Oct 2013 15:41:23 +0200 Subject: [PATCH] Octave interface: Improved Unit test --- .../OctaveScripts/ResInsightIterfaceUnitTest.m | 14 +++++++------- OctavePlugin/riGetWellCells.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OctavePlugin/OctaveScripts/ResInsightIterfaceUnitTest.m b/OctavePlugin/OctaveScripts/ResInsightIterfaceUnitTest.m index 6e90916496..d059ae7241 100644 --- a/OctavePlugin/OctaveScripts/ResInsightIterfaceUnitTest.m +++ b/OctavePlugin/OctaveScripts/ResInsightIterfaceUnitTest.m @@ -134,13 +134,13 @@ WellNames2 = riGetWellNames(1); ### Vector[WellCellInfo] riGetWellCells([CaseId], WellName, TimeStep) printf ("===== Testing ====> riGetWellCells\n"); -WellCellInfos1 = riGetWellCells(1, WellNames1(1), 3); -WellCellInfos2 = riGetWellCells(WellNames1(1), 3); +WellCellInfos1 = riGetWellCells(1, WellNames1(1,:), 3); +WellCellInfos2 = riGetWellCells(WellNames1(1,:), 3); + -if(0) ### Vector[WellStatus] riGetWellStatus ([CaseId], WellName, [RequestedTimeSteps]) printf ("===== Testing ====> riGetWellStatus\n"); -WellStatuses1 = riGetWellStatus(1, WellNames1(1), [1,3]); -WellStatuses2 = riGetWellStatus( WellNames1(1), [1,3]); -WellStatuses3 = riGetWellStatus(WellNames1(1)); -endif \ No newline at end of file +WellStatuses1 = riGetWellStatus(1, WellNames1(1,:), [1,3]); +disp(WellStatuses1(1)); +WellStatuses2 = riGetWellStatus( WellNames1(1,:), [1,3]); +WellStatuses3 = riGetWellStatus(WellNames1(1,:)); diff --git a/OctavePlugin/riGetWellCells.cpp b/OctavePlugin/riGetWellCells.cpp index 17768fad3d..3183345d28 100644 --- a/OctavePlugin/riGetWellCells.cpp +++ b/OctavePlugin/riGetWellCells.cpp @@ -71,7 +71,7 @@ void getWellCells( std::vector& cellIs, quint64 cellCount; socketStream >> cellCount; - octave_stdout << "riGetWellCells2: Num cells = " << cellCount << std::endl; + octave_stdout << "riGetWellCells: Number of cells in well " << wellName.toLatin1().data() << " : " << cellCount << std::endl; cellIs .reserve(cellCount); cellJs .reserve(cellCount);