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: Current Case is now interpreted correctly by Resinsight

Browse Source 
The method returning the current case had not been updated to do so.
Some debug output is also removed.
This commit is contained in:
Ceetron
2013-09-27 16:25:40 +02:00
parent 26d5a7c5b0
commit 6a7181e1d9
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@@ -161,7 +161,13 @@ void RiaSocketServer::handleClientConnection(QTcpSocket* clientToHandle)
//--------------------------------------------------------------------------------------------------
RimCase* RiaSocketServer::findReservoir(int caseId)
{
int currCaseId = caseId;
if (caseId < 0)
{
currCaseId = this->currentCaseId();
}
if (currCaseId < 0)
{
if (RiaApplication::instance()->activeReservoirView())
{
@@ -223,8 +229,6 @@ void RiaSocketServer::readCommandFromOctave()
CVF_ASSERT(args.size() > 0);
std::cout << args[0].data() << std::endl;
m_currentCommand = RiaSocketCommandFactory::instance()->create(args[0]);
if (m_currentCommand)

5
OctavePlugin/riGetActiveCellInfo.cpp
View File

@@ -177,10 +177,7 @@ DEFUN_DLD (riGetActiveCellInfo, args, nargout,
{
porosityModel = args(1).char_matrix_value().row_as_string(0).c_str();
}
}
octave_stdout << "Porosity: " << porosityModel.toStdString() << " CaseId : " << caseId << std::endl;
}
getActiveCellInfo(propertyFrames, "127.0.0.1", 40001, caseId, porosityModel);