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

Janitor : Avoid include of header file in header

Browse Source
This commit is contained in:
Magne Sjaastad
2021-05-26 11:31:47 +02:00
parent 3fca5f15ae
commit 9d58769f89
29 changed files with 140 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
GrpcInterface/RiaGrpcSimulationWellService.cpp
View File

@@ -22,6 +22,7 @@
#include "RigEclipseCaseData.h"
#include "RigGridBase.h"
#include "RigSimWellData.h"
#include "RigWellResultPoint.h"
#include "RimCase.h"
#include "RimEclipseCase.h"
@@ -57,23 +58,23 @@ grpc::Status RiaGrpcSimulationWellService::GetSimulationWellStatus( grpc::Server
bool wellStatus = false;
if ( currentWellResult->hasWellResult( tsIdx ) )
{
switch ( currentWellResult->wellResultFrame( tsIdx ).m_productionType )
switch ( currentWellResult->wellResultFrame( tsIdx )->m_productionType )
{
case RigWellResultFrame::PRODUCER:
case RiaDefines::WellProductionType::PRODUCER:
wellType = "Producer";
break;
case RigWellResultFrame::OIL_INJECTOR:
case RiaDefines::WellProductionType::OIL_INJECTOR:
wellType = "OilInjector";
break;
case RigWellResultFrame::WATER_INJECTOR:
case RiaDefines::WellProductionType::WATER_INJECTOR:
wellType = "WaterInjector";
break;
case RigWellResultFrame::GAS_INJECTOR:
case RiaDefines::WellProductionType::GAS_INJECTOR:
wellType = "GasInjector";
break;
}
wellStatus = currentWellResult->wellResultFrame( tsIdx ).m_isOpen;
wellStatus = currentWellResult->wellResultFrame( tsIdx )->m_isOpen;
}
reply->set_well_type( wellType.toStdString() );
@@ -106,14 +107,14 @@ grpc::Status RiaGrpcSimulationWellService::GetSimulationWellCells( grpc::ServerC
if ( currentWellResult->hasWellResult( tsIdx ) )
{
// Fetch results
const RigWellResultFrame& wellResFrame = currentWellResult->wellResultFrame( tsIdx );
const RigWellResultFrame* wellResFrame = currentWellResult->wellResultFrame( tsIdx );
std::vector<RigGridBase*> grids;
eclipseCase->eclipseCaseData()->allGrids( &grids );
for ( size_t bIdx = 0; bIdx < wellResFrame.m_wellResultBranches.size(); ++bIdx )
for ( size_t bIdx = 0; bIdx < wellResFrame->m_wellResultBranches.size(); ++bIdx )
{
const std::vector<RigWellResultPoint>& branchResPoints =
wellResFrame.m_wellResultBranches[bIdx].m_branchResultPoints;
wellResFrame->m_wellResultBranches[bIdx].m_branchResultPoints;
for ( size_t rpIdx = 0; rpIdx < branchResPoints.size(); ++rpIdx )
{
const RigWellResultPoint& resPoint = branchResPoints[rpIdx];