From bb0f0266446bb56701741b3c6ba087db70e14021 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 2 Mar 2018 14:09:46 +0100 Subject: [PATCH] Whitespace --- .../RigSimulationWellCenterLineCalculator.cpp | 17 ++++++------ .../RigSimulationWellCenterLineCalculator.h | 27 +++++++++++-------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp index ed27f393d3..2d47615e51 100644 --- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp @@ -40,13 +40,14 @@ /// The returned CellIds is one less than the number of centerline points, /// and are describing the lines between the points, starting with the first line //-------------------------------------------------------------------------------------------------- -void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(RimSimWellInView* rimWell, - std::vector< std::vector >& pipeBranchesCLCoords, - std::vector< std::vector >& pipeBranchesCellIds) +void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline( + RimSimWellInView* rimWell, + std::vector>& pipeBranchesCLCoords, + std::vector>& pipeBranchesCellIds) { CVF_ASSERT(rimWell); - const RigSimWellData* simWellData = rimWell->simWellData(); + const RigSimWellData* simWellData = rimWell->simWellData(); RimEclipseView* eclipseView; rimWell->firstAncestorOrThisOfType(eclipseView); @@ -54,17 +55,17 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(Ri CVF_ASSERT(eclipseView); RigEclipseCaseData* eclipseCaseData = eclipseView->eclipseCase()->eclipseCaseData(); - bool isAutoDetectBranches = eclipseView->wellCollection()->isAutoDetectingBranches(); + bool isAutoDetectBranches = eclipseView->wellCollection()->isAutoDetectingBranches(); - bool useAllCellCenters = rimWell->isUsingCellCenterForPipe(); - int timeStepIndex = -1; + bool useAllCellCenters = rimWell->isUsingCellCenterForPipe(); + int timeStepIndex = -1; calculateWellPipeCenterlineFromWellFrame(eclipseCaseData, simWellData, timeStepIndex, isAutoDetectBranches, useAllCellCenters, - pipeBranchesCLCoords, + pipeBranchesCLCoords, pipeBranchesCellIds); } diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h index 1eaf5f2e61..ec87e69112 100644 --- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h +++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h @@ -19,28 +19,33 @@ #pragma once #include "RigSimWellData.h" + #include "cvfVector3.h" + #include class RigEclipseCaseData; class RimSimWellInView; +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- class RigSimulationWellCenterLineCalculator { public: - static void calculateWellPipeStaticCenterline(RimSimWellInView* rimWell, - std::vector< std::vector >& pipeBranchesCLCoords, - std::vector< std::vector >& pipeBranchesCellIds) ; + static void calculateWellPipeStaticCenterline(RimSimWellInView* rimWell, + std::vector>& pipeBranchesCLCoords, + std::vector>& pipeBranchesCellIds); + + static void calculateWellPipeCenterlineFromWellFrame(const RigEclipseCaseData* eclipseCaseData, + const RigSimWellData* simWellData, + int timeStepIndex, + bool isAutoDetectBranches, + bool useAllCellCenters, + std::vector>& pipeBranchesCLCoords, + std::vector>& pipeBranchesCellIds); - static void calculateWellPipeCenterlineFromWellFrame(const RigEclipseCaseData* eclipseCaseData, - const RigSimWellData* simWellData, - int timeStepIndex, - bool isAutoDetectBranches, - bool useAllCellCenters, - std::vector> &pipeBranchesCLCoords, - std::vector> &pipeBranchesCellIds); private: - static bool hasAnyResultCells(const std::vector &resBranches); static bool hasAnyValidDataCells(const RigWellResultBranch& branch); static void finishPipeCenterLine( std::vector< std::vector > &pipeBranchesCLCoords, const cvf::Vec3d& lastCellCenter ) ;