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

#4655 Python Fix crash when streaming properties to ResInsight

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-09-02 15:12:07 +02:00
parent 7ab9b2a889
commit 551e459942
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ApplicationCode/GrpcInterface/RiaGrpcPropertiesService.cpp
View File

@@ -54,8 +54,8 @@ public:
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiaCellResultsStateHandler(bool clientStreamer = false) RiaCellResultsStateHandler(bool clientStreamer = false)
: m_request(nullptr) : m_eclipseCase(nullptr)
, m_eclipseCase(nullptr) , m_porosityModel(RiaDefines::MATRIX_MODEL)
, m_streamedValueCount(0u) , m_streamedValueCount(0u)
, m_cellCount(0u) , m_cellCount(0u)
, m_clientStreamer(clientStreamer) , m_clientStreamer(clientStreamer)
@@ -83,26 +83,24 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
Status init(const PropertyRequest* request) Status init(const PropertyRequest* request)
{ {
m_request = request;
int caseId = request->case_request().id(); int caseId = request->case_request().id();
m_eclipseCase = dynamic_cast<RimEclipseCase*>(RiaGrpcServiceInterface::findCase(caseId)); m_eclipseCase = dynamic_cast<RimEclipseCase*>(RiaGrpcServiceInterface::findCase(caseId));
if (m_eclipseCase) if (m_eclipseCase)
{ {
auto porosityModel = static_cast<RiaDefines::PorosityModelType>(request->porosity_model()); m_porosityModel = static_cast<RiaDefines::PorosityModelType>(request->porosity_model());
auto caseData = m_eclipseCase->eclipseCaseData(); auto caseData = m_eclipseCase->eclipseCaseData();
auto resultData = caseData->results(porosityModel); auto resultData = caseData->results(m_porosityModel);
auto resultType = static_cast<RiaDefines::ResultCatType>(request->property_type()); auto resultType = static_cast<RiaDefines::ResultCatType>(request->property_type());
size_t timeStep = static_cast<size_t>(request->time_step()); size_t timeStep = static_cast<size_t>(request->time_step());
m_resultAddress = RigEclipseResultAddress(resultType, QString::fromStdString(request->property_name())); m_resultAddress = RigEclipseResultAddress(resultType, QString::fromStdString(request->property_name()));
if (resultData->ensureKnownResultLoaded(m_resultAddress)) if (resultData->ensureKnownResultLoaded(m_resultAddress))
{ {
if (timeStep < resultData->timeStepCount(m_resultAddress)) if (timeStep < resultData->timeStepCount(m_resultAddress))
{ {
initResultAccess(caseData, request->grid_index(), porosityModel, timeStep, m_resultAddress); initResultAccess(caseData, request->grid_index(), m_porosityModel, timeStep, m_resultAddress);
return grpc::Status::OK; return grpc::Status::OK;
} }
return grpc::Status(grpc::NOT_FOUND, "No such time step"); return grpc::Status(grpc::NOT_FOUND, "No such time step");
@@ -120,7 +118,7 @@ public:
scalarResultFrames.resize(timeStepCount); scalarResultFrames.resize(timeStepCount);
if (timeStep < resultData->timeStepCount(m_resultAddress)) if (timeStep < resultData->timeStepCount(m_resultAddress))
{ {
initResultAccess(caseData, request->grid_index(), porosityModel, timeStep, m_resultAddress); initResultAccess(caseData, request->grid_index(), m_porosityModel, timeStep, m_resultAddress);
return grpc::Status::OK; return grpc::Status::OK;
} }
return grpc::Status(grpc::NOT_FOUND, "No such time step"); return grpc::Status(grpc::NOT_FOUND, "No such time step");
@@ -198,9 +196,8 @@ public:
{ {
if (m_eclipseCase) if (m_eclipseCase)
{ {
auto porosityModel = static_cast<RiaDefines::PorosityModelType>(m_request->porosity_model());
auto caseData = m_eclipseCase->eclipseCaseData(); auto caseData = m_eclipseCase->eclipseCaseData();
auto resultData = caseData->results(porosityModel); auto resultData = caseData->results(m_porosityModel);
resultData->recalculateStatistics(m_resultAddress); resultData->recalculateStatistics(m_resultAddress);
for (Rim3dView* view : m_eclipseCase->views()) for (Rim3dView* view : m_eclipseCase->views())
@@ -221,12 +218,12 @@ protected:
virtual void setCellResult(size_t currentCellIndex, double value) = 0; virtual void setCellResult(size_t currentCellIndex, double value) = 0;
protected: protected:
const rips::PropertyRequest* m_request; RimEclipseCase* m_eclipseCase;
RimEclipseCase* m_eclipseCase; RiaDefines::PorosityModelType m_porosityModel;
size_t m_streamedValueCount; size_t m_streamedValueCount;
size_t m_cellCount; size_t m_cellCount;
bool m_clientStreamer; bool m_clientStreamer;
RigEclipseResultAddress m_resultAddress; RigEclipseResultAddress m_resultAddress;
}; };
class RiaActiveCellResultsStateHandler : public RiaCellResultsStateHandler class RiaActiveCellResultsStateHandler : public RiaCellResultsStateHandler

7
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@@ -437,7 +437,12 @@ const RigActiveCellInfo* RigCaseCellResultsData::activeCellInfo() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::recalculateStatistics(const RigEclipseResultAddress& resVarAddr) void RigCaseCellResultsData::recalculateStatistics(const RigEclipseResultAddress& resVarAddr)
{ {
m_statisticsDataCache[findScalarResultIndexFromAddress(resVarAddr)]->clearAllStatistics(); size_t scalarResultIndex = findScalarResultIndexFromAddress(resVarAddr);
CVF_TIGHT_ASSERT(scalarResultIndex < m_cellScalarResults.size());
if (scalarResultIndex < m_cellScalarResults.size())
{
m_statisticsDataCache[scalarResultIndex]->clearAllStatistics();
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------