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

Major renaming of classes. Filenames not done yet.

Browse Source 
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21064
This commit is contained in:
Jacob Støren
2013-03-22 15:43:42 +01:00
parent bd33a64e84
commit e493db37d0
62 changed files with 349 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@@ -151,7 +151,7 @@ void RiaSocketServer::handleClientConnection(QTcpSocket* clientToHandle)
//--------------------------------------------------------------------------------------------------
/// Find the requested reservoir: Current, by index or by name
//--------------------------------------------------------------------------------------------------
RimReservoir* RiaSocketServer::findReservoir(const QString& caseName)
RimCase* RiaSocketServer::findReservoir(const QString& caseName)
{
if (caseName.isEmpty())
{
@@ -241,7 +241,7 @@ void RiaSocketServer::readCommandFromOctave()
QString caseName;
QString propertyName;
RimReservoir* reservoir = NULL;
RimCase* reservoir = NULL;
// Find the correct arguments
@@ -502,7 +502,7 @@ void RiaSocketServer::readPropertyDataFromOctave()
if (m_currentReservoir != NULL)
{
// Create a new input property if we have an input reservoir
RimInputReservoir* inputRes = dynamic_cast<RimInputReservoir*>(m_currentReservoir);
RimInputCase* inputRes = dynamic_cast<RimInputCase*>(m_currentReservoir);
if (inputRes)
{
RimInputProperty* inputProperty = NULL;

6
ApplicationCode/SocketInterface/RiaSocketServer.h
View File

@@ -27,7 +27,7 @@ class QTcpServer;
class QTcpSocket;
class QNetworkSession;
class QErrorMessage;
class RimReservoir;
class RimCase;
class RiaSocketServer : public QObject
@@ -53,7 +53,7 @@ private:
void handleClientConnection( QTcpSocket* clientToHandle);
RimReservoir* findReservoir(const QString &casename);
RimCase* findReservoir(const QString &casename);
void terminateCurrentConnection();
void calculateMatrixModelActiveCellInfo(std::vector<qint32>& gridNumber,
@@ -80,7 +80,7 @@ private:
quint64 m_bytesPerTimeStepToRead;
size_t m_currentTimeStepToRead;
std::vector< std::vector<double> >* m_scalarResultsToAdd;
RimReservoir* m_currentReservoir;
RimCase* m_currentReservoir;
size_t m_currentScalarIndex;
QString m_currentPropertyName;
bool m_invalidActiveCellCountDetected;