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

#1996 Rename RigSingleWellResultsData -> RigSimWellData

Browse Source
This commit is contained in:
Rebecca Cox
2017-10-13 13:44:53 +02:00
parent e3ac94a940
commit 44be1bfd6b
39 changed files with 203 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
View File

@@ -209,15 +209,15 @@ void RivSimWellPipesPartMgr::updatePipeResultColor(size_t frameIndex)
{
if (m_rimWell == NULL) return;
RigSingleWellResultsData* wRes = m_rimWell->wellResults();
if (wRes == NULL) return;
RigSimWellData* simWellData = m_rimWell->simWellData();
if (simWellData == NULL) return;
if (!wRes->hasWellResult(frameIndex)) return; // Or reset colors or something
if (!simWellData->hasWellResult(frameIndex)) return; // Or reset colors or something
const double closed = -0.1, producing = 1.5, water = 2.5, hcInjection = 3.5; // Closed set to -0.1 instead of 0.5 to workaround bug in the scalar mapper.
std::list<RivPipeBranchData>::iterator brIt;
const RigWellResultFrame& wResFrame = wRes->wellResultFrame(frameIndex);
const RigWellResultFrame& wResFrame = simWellData->wellResultFrame(frameIndex);
std::vector<double> wellCellStates;

4
ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h
View File

@@ -18,13 +18,15 @@
#pragma once
#include "RigSimWellData.h"
#include "cvfBase.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include "cafPdmPointer.h"
#include <list>
#include "RigSingleWellResultsData.h"
namespace cvf
{

18
ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp
View File

@@ -23,7 +23,7 @@
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
#include "RigSingleWellResultsData.h"
#include "RigSimWellData.h"
#include "RigFlowDiagResults.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
@@ -63,11 +63,11 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasi
if ( m_rimReservoirView.isNull() ) return;
if ( !m_rimReservoirView->eclipseCase() ) return;
if ( !m_rimWell->showWell() ) return;
if ( !m_rimWell->wellResults()->hasWellResult(frameIndex) ) return;
if ( !m_rimWell->wellResults()->wellResultFrame(frameIndex).m_isOpen ) return;
if ( m_rimWell->wellResults()->wellResultFrame(frameIndex).m_productionType == RigWellResultFrame::UNDEFINED_PRODUCTION_TYPE ) return;
if ( !m_rimWell->simWellData()->hasWellResult(frameIndex) ) return;
if ( !m_rimWell->simWellData()->wellResultFrame(frameIndex).m_isOpen ) return;
if ( m_rimWell->simWellData()->wellResultFrame(frameIndex).m_productionType == RigWellResultFrame::UNDEFINED_PRODUCTION_TYPE ) return;
bool isProducer = (m_rimWell->wellResults()->wellResultFrame(frameIndex).m_productionType == RigWellResultFrame::PRODUCER);
bool isProducer = (m_rimWell->simWellData()->wellResultFrame(frameIndex).m_productionType == RigWellResultFrame::PRODUCER);
double pipeRadius = m_rimWell->pipeRadius();
cvf::Vec3d wellHeadTop;
@@ -129,11 +129,11 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasi
for ( RimSimWellInView * otherWell: wellColl->wells )
{
if ( otherWell == m_rimWell ) continue;
if ( !otherWell->wellResults()->hasWellResult(frameIndex) ) continue;
if ( !otherWell->wellResults()->wellResultFrame(frameIndex).m_isOpen ) continue;
if ( otherWell->wellResults()->wellResultFrame(frameIndex).m_productionType == RigWellResultFrame::UNDEFINED_PRODUCTION_TYPE ) continue;
if ( !otherWell->simWellData()->hasWellResult(frameIndex) ) continue;
if ( !otherWell->simWellData()->wellResultFrame(frameIndex).m_isOpen ) continue;
if ( otherWell->simWellData()->wellResultFrame(frameIndex).m_productionType == RigWellResultFrame::UNDEFINED_PRODUCTION_TYPE ) continue;
bool isOtherProducer = (otherWell->wellResults()->wellResultFrame(frameIndex).m_productionType == RigWellResultFrame::PRODUCER);
bool isOtherProducer = (otherWell->simWellData()->wellResultFrame(frameIndex).m_productionType == RigWellResultFrame::PRODUCER);
{
std::string otherWellName = otherWell->name().toStdString();

6
ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
View File

@@ -28,7 +28,7 @@
#include "RigCell.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigSingleWellResultsData.h"
#include "RigSimWellData.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
@@ -98,9 +98,9 @@ void RivWellHeadPartMgr::buildWellHeadParts(size_t frameIndex)
if (!well->wellResults()->hasWellResult(frameIndex)) return;
if (!well->simWellData()->hasWellResult(frameIndex)) return;
const RigWellResultFrame& wellResultFrame = well->wellResults()->wellResultFrame(frameIndex);
const RigWellResultFrame& wellResultFrame = well->simWellData()->wellResultFrame(frameIndex);
double pipeRadius = m_rimWell->pipeRadius();

4
ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.cpp
View File

@@ -21,7 +21,7 @@
#include "RiaApplication.h"
#include "RigMainGrid.h"
#include "RigSingleWellResultsData.h"
#include "RigSimWellData.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
@@ -76,7 +76,7 @@ void RivWellSpheresPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicLis
const RigMainGrid* mainGrid = m_rimReservoirView->mainGrid();
CVF_ASSERT(mainGrid);
RigSingleWellResultsData* rigWellResult = m_rimWell->wellResults();
RigSimWellData* rigWellResult = m_rimWell->simWellData();
if (!rigWellResult) return;
if (!rigWellResult->hasWellResult(frameIndex)) return;