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

#2483 Refactoring : Simplify generation of well branch geometry (2)

Browse Source
This commit is contained in:
Magne Sjaastad 2018-03-02 14:07:31 +01:00
parent 7bd0bdc612
commit 08995cf63e
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
View File

@ -43,18 +43,6 @@
void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(RimSimWellInView* rimWell, void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(RimSimWellInView* rimWell,
std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords, std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds)
{
calculateWellPipeDynamicCenterline(rimWell, -1, pipeBranchesCLCoords, pipeBranchesCellIds);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(const RimSimWellInView* rimWell,
int timeStepIndex,
std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds)
{ {
CVF_ASSERT(rimWell); CVF_ASSERT(rimWell);
@ -69,6 +57,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(c
bool isAutoDetectBranches = eclipseView->wellCollection()->isAutoDetectingBranches(); bool isAutoDetectBranches = eclipseView->wellCollection()->isAutoDetectingBranches();
bool useAllCellCenters = rimWell->isUsingCellCenterForPipe(); bool useAllCellCenters = rimWell->isUsingCellCenterForPipe();
int timeStepIndex = -1;
calculateWellPipeCenterlineFromWellFrame(eclipseCaseData, calculateWellPipeCenterlineFromWellFrame(eclipseCaseData,
simWellData, simWellData,

6
ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h
View File

@ -32,12 +32,6 @@ public:
std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords, std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) ; std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) ;
static void calculateWellPipeDynamicCenterline(const RimSimWellInView* rimWell,
int timeStepIndex,
std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) ;
static void calculateWellPipeCenterlineFromWellFrame(const RigEclipseCaseData* eclipseCaseData, static void calculateWellPipeCenterlineFromWellFrame(const RigEclipseCaseData* eclipseCaseData,
const RigSimWellData* simWellData, const RigSimWellData* simWellData,
int timeStepIndex, int timeStepIndex,