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

Produce geometry for all cells, not per grid

Browse Source 
p4#: 21710
This commit is contained in:
Magne Sjaastad 2013-05-24 09:54:32 +02:00
parent 5d2249aaea
commit d9750b2dd4
3 changed files with 80 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
ApplicationCode/SocketInterface/RiaSocketCommands.cpp
View File

@ -417,37 +417,36 @@ public:
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
{ {
int argCaseGroupId = -1; int argCaseGroupId = -1;
size_t argGridIndex = 0;
QString porosityModelName; QString porosityModelName;
if (args.size() == 2) if (args.size() == 2)
{ {
argGridIndex = args[1].toInt(); bool numberConversionOk = false;
int tmpValue = args[1].toInt(&numberConversionOk);
if (numberConversionOk)
{
argCaseGroupId = tmpValue;
}
else
{
porosityModelName = args[1];
}
} }
else if (args.size() == 3) else if (args.size() == 3)
{ {
bool numberConversionOk = false; bool numberConversionOk = false;
int tmpValue = args[2].toInt(&numberConversionOk); int tmpValue = args[1].toInt(&numberConversionOk);
if (numberConversionOk) if (numberConversionOk)
{ {
// Two arguments, caseID and gridIndex argCaseGroupId = args[1].toUInt();
argCaseGroupId = args[1].toInt(); porosityModelName = args[2];
argGridIndex = args[2].toUInt();
} }
else else
{ {
// Two arguments, gridIndex and porosity model argCaseGroupId = args[2].toUInt();
argGridIndex = args[1].toUInt(); porosityModelName = args[1];
porosityModelName = args[2];
} }
} }
else if (args.size() > 3)
{
// Two arguments, caseID and gridIndex
argCaseGroupId = args[1].toInt();
argGridIndex = args[2].toUInt();
porosityModelName = args[3];
}
RifReaderInterface::PorosityModelResultType porosityModelEnum = RifReaderInterface::MATRIX_RESULTS; RifReaderInterface::PorosityModelResultType porosityModelEnum = RifReaderInterface::MATRIX_RESULTS;
if (porosityModelName.toUpper() == "FRACTURE") if (porosityModelName.toUpper() == "FRACTURE")
@ -456,7 +455,7 @@ public:
} }
RimCase* rimCase = server->findReservoir(argCaseGroupId); RimCase* rimCase = server->findReservoir(argCaseGroupId);
if (!rimCase || !rimCase->reservoirData() || (argGridIndex >= rimCase->reservoirData()->gridCount()) ) if (!rimCase || !rimCase->reservoirData())
{ {
// No data available // No data available
socketStream << (quint64)0 << (quint64)0 ; socketStream << (quint64)0 << (quint64)0 ;
@ -464,15 +463,9 @@ public:
} }
RigActiveCellInfo* actCellInfo = rimCase->reservoirData()->activeCellInfo(porosityModelEnum); RigActiveCellInfo* actCellInfo = rimCase->reservoirData()->activeCellInfo(porosityModelEnum);
RigMainGrid* mainGrid = rimCase->reservoirData()->mainGrid();
RigGridBase* rigGrid = rimCase->reservoirData()->grid(argGridIndex); size_t activeCellCount = actCellInfo->globalActiveCellCount();
quint64 cellCountI = (quint64)rigGrid->cellCountI();
quint64 cellCountJ = (quint64)rigGrid->cellCountJ();
quint64 cellCountK = (quint64)rigGrid->cellCountK();
size_t activeCellCount = 0;
actCellInfo->gridActiveCellCounts(argGridIndex, activeCellCount);
size_t doubleValueCount = activeCellCount * 3; size_t doubleValueCount = activeCellCount * 3;
// This structure is supposed to be received by Octave using a NDArray. The ordering of this loop is // This structure is supposed to be received by Octave using a NDArray. The ordering of this loop is
@ -489,22 +482,13 @@ public:
quint64 coordCount = 0; quint64 coordCount = 0;
for (size_t coordIdx = 0; coordIdx < 3; coordIdx++) for (size_t coordIdx = 0; coordIdx < 3; coordIdx++)
{ {
for (size_t k = 0; k < cellCountK; k++) for (size_t globalCellIdx = 0; globalCellIdx < mainGrid->cells().size(); globalCellIdx++)
{ {
for (size_t j = 0; j < cellCountJ; j++) if (!actCellInfo->isActive(globalCellIdx)) continue;
{
for (size_t i = 0; i < cellCountI; i++)
{
size_t localCellIdx = rigGrid->cellIndexFromIJK(i, j, k);
size_t globalCellIdx = rigGrid->globalGridCellIndex(localCellIdx);
if (!actCellInfo->isActive(globalCellIdx)) continue; cvf::Vec3d center = mainGrid->cells()[globalCellIdx].center();
cvf::Vec3d center = rigGrid->cell(localCellIdx).center(); cellCenterValues[coordCount++] = center[coordIdx];
cellCenterValues[coordCount++] = center[coordIdx];
}
}
} }
} }
@ -623,37 +607,36 @@ public:
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
{ {
int argCaseGroupId = -1; int argCaseGroupId = -1;
size_t argGridIndex = 0;
QString porosityModelName; QString porosityModelName;
if (args.size() == 2) if (args.size() == 2)
{ {
argGridIndex = args[1].toInt(); bool numberConversionOk = false;
int tmpValue = args[1].toInt(&numberConversionOk);
if (numberConversionOk)
{
argCaseGroupId = tmpValue;
}
else
{
porosityModelName = args[1];
}
} }
else if (args.size() == 3) else if (args.size() == 3)
{ {
bool numberConversionOk = false; bool numberConversionOk = false;
int tmpValue = args[2].toInt(&numberConversionOk); int tmpValue = args[1].toInt(&numberConversionOk);
if (numberConversionOk) if (numberConversionOk)
{ {
// Two arguments, caseID and gridIndex argCaseGroupId = args[1].toUInt();
argCaseGroupId = args[1].toInt(); porosityModelName = args[2];
argGridIndex = args[2].toUInt();
} }
else else
{ {
// Two arguments, gridIndex and porosity model argCaseGroupId = args[2].toUInt();
argGridIndex = args[1].toUInt(); porosityModelName = args[1];
porosityModelName = args[2];
} }
} }
else if (args.size() > 3)
{
// Two arguments, caseID and gridIndex
argCaseGroupId = args[1].toInt();
argGridIndex = args[2].toUInt();
porosityModelName = args[3];
}
RifReaderInterface::PorosityModelResultType porosityModelEnum = RifReaderInterface::MATRIX_RESULTS; RifReaderInterface::PorosityModelResultType porosityModelEnum = RifReaderInterface::MATRIX_RESULTS;
if (porosityModelName.toUpper() == "FRACTURE") if (porosityModelName.toUpper() == "FRACTURE")
@ -662,7 +645,7 @@ public:
} }
RimCase* rimCase = server->findReservoir(argCaseGroupId); RimCase* rimCase = server->findReservoir(argCaseGroupId);
if (!rimCase || !rimCase->reservoirData() || (argGridIndex >= rimCase->reservoirData()->gridCount()) ) if (!rimCase || !rimCase->reservoirData() )
{ {
// No data available // No data available
socketStream << (quint64)0 << (quint64)0 ; socketStream << (quint64)0 << (quint64)0 ;
@ -670,14 +653,9 @@ public:
} }
RigActiveCellInfo* actCellInfo = rimCase->reservoirData()->activeCellInfo(porosityModelEnum); RigActiveCellInfo* actCellInfo = rimCase->reservoirData()->activeCellInfo(porosityModelEnum);
RigGridBase* rigGrid = rimCase->reservoirData()->grid(argGridIndex); RigMainGrid* mainGrid = rimCase->reservoirData()->mainGrid();
quint64 cellCountI = (quint64)rigGrid->cellCountI(); size_t activeCellCount = actCellInfo->globalActiveCellCount();
quint64 cellCountJ = (quint64)rigGrid->cellCountJ();
quint64 cellCountK = (quint64)rigGrid->cellCountK();
size_t activeCellCount = 0;
actCellInfo->gridActiveCellCounts(argGridIndex, activeCellCount);
size_t doubleValueCount = activeCellCount * 3 * 8; size_t doubleValueCount = activeCellCount * 3 * 8;
// This structure is supposed to be received by Octave using a NDArray. The ordering of this loop is // This structure is supposed to be received by Octave using a NDArray. The ordering of this loop is
@ -698,22 +676,13 @@ public:
{ {
for (size_t cornerIdx = 0; cornerIdx < 8; cornerIdx++) for (size_t cornerIdx = 0; cornerIdx < 8; cornerIdx++)
{ {
for (size_t k = 0; k < cellCountK; k++) for (size_t globalCellIdx = 0; globalCellIdx < mainGrid->cells().size(); globalCellIdx++)
{ {
for (size_t j = 0; j < cellCountJ; j++) if (!actCellInfo->isActive(globalCellIdx)) continue;
{
for (size_t i = 0; i < cellCountI; i++)
{
size_t localCellIdx = rigGrid->cellIndexFromIJK(i, j, k);
size_t globalCellIdx = rigGrid->globalGridCellIndex(localCellIdx);
if (!actCellInfo->isActive(globalCellIdx)) continue; mainGrid->cellCornerVertices(globalCellIdx, cornerVerts);
rigGrid->cellCornerVertices(localCellIdx, cornerVerts); cellCornerValues[coordCount++] = cornerVerts[cornerIdx][coordIdx];
cellCornerValues[coordCount++] = cornerVerts[cornerIdx][coordIdx];
}
}
} }
} }
} }

43
OctavePlugin/riGetActiveCellCenters.cpp
View File

@ -4,7 +4,7 @@
#include "riSettings.h" #include "riSettings.h"
void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16 port, const qint32& caseId, const quint32& gridIndex, const QString& porosityModel) void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16 port, const qint32& caseId, const QString& porosityModel)
{ {
QString serverName = hostName; QString serverName = hostName;
quint16 serverPort = port; quint16 serverPort = port;
@ -22,7 +22,7 @@ void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, qu
// Create command and send it: // Create command and send it:
QString command = QString("GetActiveCellCenters %1 %2 %3").arg(caseId).arg(gridIndex).arg(porosityModel); QString command = QString("GetActiveCellCenters %1 %2").arg(caseId).arg(porosityModel);
QByteArray cmdBytes = command.toLatin1(); QByteArray cmdBytes = command.toLatin1();
QDataStream socketStream(&socket); QDataStream socketStream(&socket);
@ -91,7 +91,7 @@ void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, qu
DEFUN_DLD (riGetActiveCellCenters, args, nargout, DEFUN_DLD (riGetActiveCellCenters, args, nargout,
"Usage:\n" "Usage:\n"
"\n" "\n"
" riGetActiveCellCenters([CaseId], GridIndex, [PorosityModel = “Matrix”|”Fracture”] )\n" " riGetActiveCellCenters([CaseId], [PorosityModel = “Matrix”|”Fracture”] )\n"
"\n" "\n"
"This function returns the UTM coordinates (X, Y, Z) of the center point of all the cells in the grid.\n" "This function returns the UTM coordinates (X, Y, Z) of the center point of all the cells in the grid.\n"
"If the CaseId is not defined, ResInsight’s Current Case is used.\n" "If the CaseId is not defined, ResInsight’s Current Case is used.\n"
@ -106,14 +106,7 @@ DEFUN_DLD (riGetActiveCellCenters, args, nargout,
} }
int nargin = args.length (); int nargin = args.length ();
if (nargin < 1) if (nargin > 2)
{
error("riGetActiveCellCenters: Too few arguments. The grid index argument is required.\n");
print_usage();
return octave_value_list ();
}
if (nargin > 3)
{ {
error("riGetActiveCellCenters: Too many arguments.\n"); error("riGetActiveCellCenters: Too many arguments.\n");
print_usage(); print_usage();
@ -121,31 +114,31 @@ DEFUN_DLD (riGetActiveCellCenters, args, nargout,
} }
qint32 caseId = -1; qint32 caseId = -1;
quint32 gridIndex = 0;
std::string porosityModel = "Matrix"; std::string porosityModel = "Matrix";
if (nargin == 1) if (nargin == 1)
{ {
gridIndex = args(0).uint_value(); if (args(0).is_numeric_type())
}
else if (nargin == 2)
{
if (args(0).is_numeric_type() && args(1).is_numeric_type())
{ {
caseId = args(0).uint_value(); caseId = args(0).uint_value();
gridIndex = args(1).uint_value();
} }
else else
{ {
gridIndex = args(0).uint_value(); porosityModel = args(0).string_value();
porosityModel = args(1).string_value();
} }
} }
else if (nargin == 3) else if (nargin == 2)
{ {
caseId = args(0).uint_value(); if (args(0).is_numeric_type())
gridIndex = args(1).uint_value(); {
porosityModel = args(2).string_value(); caseId = args(0).uint_value();
porosityModel = args(1).string_value();
}
else
{
caseId = args(1).uint_value();
porosityModel = args(0).string_value();
}
} }
if (porosityModel != "Matrix" && porosityModel != "Fracture") if (porosityModel != "Matrix" && porosityModel != "Fracture")
@ -156,7 +149,7 @@ DEFUN_DLD (riGetActiveCellCenters, args, nargout,
} }
NDArray cellCenterValues; NDArray cellCenterValues;
getActiveCellCenters(cellCenterValues, "127.0.0.1", 40001, caseId, gridIndex, porosityModel.c_str()); getActiveCellCenters(cellCenterValues, "127.0.0.1", 40001, caseId, porosityModel.c_str());
return octave_value(cellCenterValues); return octave_value(cellCenterValues);
} }

42
OctavePlugin/riGetActiveCellCorners.cpp
View File

@ -4,7 +4,7 @@
#include "riSettings.h" #include "riSettings.h"
void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, quint16 port, const qint32& caseId, const quint32& gridIndex, const QString& porosityModel) void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, quint16 port, const qint32& caseId, const QString& porosityModel)
{ {
QString serverName = hostName; QString serverName = hostName;
quint16 serverPort = port; quint16 serverPort = port;
@ -22,7 +22,7 @@ void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, qu
// Create command and send it: // Create command and send it:
QString command = QString("GetActiveCellCorners %1 %2 %3").arg(caseId).arg(gridIndex).arg(porosityModel); QString command = QString("GetActiveCellCorners %1 %2").arg(caseId).arg(porosityModel);
QByteArray cmdBytes = command.toLatin1(); QByteArray cmdBytes = command.toLatin1();
QDataStream socketStream(&socket); QDataStream socketStream(&socket);
@ -91,7 +91,7 @@ void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, qu
DEFUN_DLD (riGetActiveCellCorners, args, nargout, DEFUN_DLD (riGetActiveCellCorners, args, nargout,
"Usage:\n" "Usage:\n"
"\n" "\n"
" riGetActiveCellCorners([CaseId], GridIndex, [PorosityModel = “Matrix”|”Fracture”] )\n" " riGetActiveCellCorners([CaseId], [PorosityModel = “Matrix”|”Fracture”] )\n"
"\n" "\n"
"This function returns the UTM coordinates (X, Y, Z) of the 8 corners of each of the active cells.\n" "This function returns the UTM coordinates (X, Y, Z) of the 8 corners of each of the active cells.\n"
"If the CaseId is not defined, ResInsight’s Current Case is used.\n" "If the CaseId is not defined, ResInsight’s Current Case is used.\n"
@ -106,14 +106,8 @@ DEFUN_DLD (riGetActiveCellCorners, args, nargout,
} }
int nargin = args.length (); int nargin = args.length ();
if (nargin < 1)
{
error("riGetActiveCellCorners: Too few arguments. The grid index argument is required.\n");
print_usage();
return octave_value_list ();
}
if (nargin > 3) if (nargin > 2)
{ {
error("riGetActiveCellCorners: Too many arguments.\n"); error("riGetActiveCellCorners: Too many arguments.\n");
print_usage(); print_usage();
@ -121,31 +115,31 @@ DEFUN_DLD (riGetActiveCellCorners, args, nargout,
} }
qint32 caseId = -1; qint32 caseId = -1;
quint32 gridIndex = 0;
std::string porosityModel = "Matrix"; std::string porosityModel = "Matrix";
if (nargin == 1) if (nargin == 1)
{ {
gridIndex = args(0).uint_value(); if (args(0).is_numeric_type())
}
else if (nargin == 2)
{
if (args(0).is_numeric_type() && args(1).is_numeric_type())
{ {
caseId = args(0).uint_value(); caseId = args(0).uint_value();
gridIndex = args(1).uint_value();
} }
else else
{ {
gridIndex = args(0).uint_value(); porosityModel = args(0).string_value();
porosityModel = args(1).string_value();
} }
} }
else if (nargin == 3) else if (nargin == 2)
{ {
caseId = args(0).uint_value(); if (args(0).is_numeric_type())
gridIndex = args(1).uint_value(); {
porosityModel = args(2).string_value(); caseId = args(0).uint_value();
porosityModel = args(1).string_value();
}
else
{
caseId = args(1).uint_value();
porosityModel = args(0).string_value();
}
} }
if (porosityModel != "Matrix" && porosityModel != "Fracture") if (porosityModel != "Matrix" && porosityModel != "Fracture")
@ -156,7 +150,7 @@ DEFUN_DLD (riGetActiveCellCorners, args, nargout,
} }
NDArray cellCornerValues; NDArray cellCornerValues;
getActiveCellCorners(cellCornerValues, "127.0.0.1", 40001, caseId, gridIndex, porosityModel.c_str()); getActiveCellCorners(cellCornerValues, "127.0.0.1", 40001, caseId, porosityModel.c_str());
return octave_value(cellCornerValues); return octave_value(cellCornerValues);
} }